Serve port 80 by default

3 files changed, 10 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 60ba1de7a664..4b08cec62077 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = algernon
-	pkgdesc = HTTP/2 web server with built-in support for Markdown, Lua, Sass (SCSS), JSX and Redis
+	pkgdesc = Web server with built-in support for Lua, Markdown, HTTP/2, templates, SCSS and Redis
 	pkgver = 1.2.1
-	pkgrel = 1
+	pkgrel = 4
 	url = http://algernon.roboticoverlords.org/
-	install = algernon.install
 	arch = x86_64
 	arch = i686
 	license = MIT
 	makedepends = go
 	makedepends = git
 	makedepends = glide
+	makedepends = setconf
 	optdepends = redis: For using the Redis database backend
 	optdepends = mariadb: For using the MariaDB/MySQL database backend
 	optdepends = postgresql: For using the PostgreSQL database backend
 	backup = etc/algernon/serverconf.lua
 	backup = usr/lib/systemd/system/algernon.service
-	source = git://github.com/xyproto/algernon#tag=1.2.1
+	source = git://github.com/xyproto/algernon#commit=8d43533
 	md5sums = SKIP
 
 pkgname = algernon
diff --git a/PKGBUILD b/PKGBUILD
index dc0402322ed3..bd44f9bf635c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=algernon
 pkgver=1.2.1
-pkgrel=3
-pkgdesc='Web server with built-in support for Lua, Markdown, HTTP/2, templates, SCSS, Redis and more'
+pkgrel=4
+pkgdesc='Web server with built-in support for Lua, Markdown, HTTP/2, templates, SCSS and Redis'
 arch=('x86_64' 'i686')
 url='http://algernon.roboticoverlords.org/'
 license=('MIT')
@@ -15,7 +15,6 @@ backup=('etc/algernon/serverconf.lua'
         'usr/lib/systemd/system/algernon.service')
 source=("git://github.com/xyproto/algernon#commit=8d43533")
 md5sums=('SKIP')
-install='algernon.install'
 _gourl=github.com/xyproto/algernon
 
 prepare() {
@@ -53,8 +52,10 @@ prepare() {
   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"
+  setconf system/algernon_dev.service \
+    ExecStart \
+    "/usr/bin/algernon -e -a --domain --server --log /var/log/algernon.log --addr=:80 /srv/http"
+  setconf system/algernon_dev.service Group=http
 }
 
 build() {
diff --git a/algernon.install b/algernon.install
deleted file mode 100644
index 82572db81040..000000000000
--- a/algernon.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  getent group algernon >/dev/null || groupadd --system algernon
-  getent passwd algernon >/dev/null || useradd --system -g algernon \
-    -d /srv/algernon -s /bin/false algernon
-
-  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: