Add samples

2 files changed, 24 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index aae7471cd64a..dc0402322ed3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,18 @@
 
 pkgname=algernon
 pkgver=1.2.1
-pkgrel=1
-pkgdesc='HTTP/2 web server with built-in support for Markdown, Lua, Sass (SCSS), JSX and Redis'
+pkgrel=3
+pkgdesc='Web server with built-in support for Lua, Markdown, HTTP/2, templates, SCSS, Redis and more'
 arch=('x86_64' 'i686')
 url='http://algernon.roboticoverlords.org/'
 license=('MIT')
-makedepends=('go' 'git' 'glide')
+makedepends=('go' 'git' 'glide' 'setconf')
 optdepends=('redis: For using the Redis database backend'
             'mariadb: For using the MariaDB/MySQL database backend'
             'postgresql: For using the PostgreSQL database backend')
 backup=('etc/algernon/serverconf.lua'
         'usr/lib/systemd/system/algernon.service')
-source=("git://github.com/xyproto/algernon#tag=$pkgver")
+source=("git://github.com/xyproto/algernon#commit=8d43533")
 md5sums=('SKIP')
 install='algernon.install'
 _gourl=github.com/xyproto/algernon
@@ -21,7 +21,6 @@ _gourl=github.com/xyproto/algernon
 prepare() {
   export GOROOT=/usr/lib/go
 
-  msg2 "Prepare build enviroment"
   rm -rf build
   mkdir -p build/go
   cd build/go
@@ -40,25 +39,27 @@ prepare() {
 
   export GOROOT="$srcdir/build/go"
   export GOPATH="$srcdir/build"
-
   export DESTPATH="$GOPATH/src/$_gourl"
+
+  # Make sure $DESTPATH is empty, but exists
+  rm -rf "$DESTPATH"
   mkdir -p "$DESTPATH"
 
-  rm -rf $DESTPATH
   mv "$srcdir/$pkgname" "$(dirname $DESTPATH)"
 
-  # Glide
-  msg2 "Download dependencies with Glide"
+  # Manage Go dependencies by using Glide
   cd "$GOPATH/src/$_gourl"
   glide update
   glide install
+
+  # Startup parameters
+  setconf system/algernon_dev.service ExecStart \
+    "/usr/bin/algernon -e -a --domain --server --log /var/log/algernon.log --addr=:80 /srv/algernon"
 }
 
 build() {
   cd "$GOPATH/src/$_gourl"
 
-  msg2 "Build application"
-  go fix
   go build -x
 }
 
@@ -66,12 +67,14 @@ package() {
   cd "$GOPATH/src/$_gourl"
 
   install -Dm755 algernon "$pkgdir/usr/bin/algernon"
-  install -Dm644 system/algernon.service "$pkgdir/usr/lib/systemd/system/algernon.service"
+  install -Dm644 system/algernon_dev.service "$pkgdir/usr/lib/systemd/system/algernon.service"
   install -Dm644 system/logrotate "$pkgdir/etc/logrotate.d/algernon"
   install -Dm644 system/serverconf.lua "$pkgdir/etc/algernon/server.lua"
   install -Dm644 desktop/algernon.desktop "$pkgdir/usr/share/desktop/algernon.desktop"
   install -Dm755 desktop/mdview "$pkgdir/usr/bin/mdview"
   install -Dm644 desktop/markdown.png "$pkgdir/usr/share/pixmaps/markdown.png"
+  install -d "$pkgdir/usr/share/doc/$pkgname/"
+  cp -r samples "$pkgdir/usr/share/doc/algernon/samples"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
diff --git a/algernon.install b/algernon.install
index 477868f23e53..82572db81040 100644
--- a/algernon.install
+++ b/algernon.install
@@ -5,6 +5,15 @@ post_install() {
 
   install -dm700 srv/algernon
   chown algernon:algernon srv/algernon
+
+  # Copy in a index.lua file if no index.* file exists in /srv/algernon/localhost
+  for f in /srv/algernon/localhost/index.*; do
+    if [[ ! -e "$f" ]]; then
+      install -Dm644 /usr/share/doc/algernon/samples/headers/index.lua \
+        /srv/algernon/localhost/index.lua
+    fi
+    break
+  done
 }
 
 # vim:set ts=2 sw=2 et: