change version to git commit, change config, move options into toml config file, moved template files

4 files changed, 30 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb861e76f3dc..0b9bdd14bd48 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Feb 11 14:32:03 UTC 2017
+# Sat Feb 11 17:18:45 UTC 2017
 pkgbase = go-wol-server-git
 	pkgdesc = Wake on Lan server
-	pkgver = 0.2
-	pkgrel = 3
+	pkgver = 23.1d7b0ba
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/fanningert/wol-server
 	arch = i686
@@ -13,19 +13,15 @@ pkgbase = go-wol-server-git
 	license = MIT
 	makedepends = go>=1.2
 	makedepends = git
-	makedepends = patch
 	provides = go-wol-server
 	options = !strip
 	options = !emptydirs
 	backup = etc/go-wol-server/config.toml
-	backup = etc/go-wol-server/templates/footer.tmpl
-	backup = etc/go-wol-server/templates/header.tmpl
-	backup = etc/go-wol-server/templates/index.tmpl
 	source = go-wol-server.service
 	source = config.toml
 	source = wol-server::git+https://github.com/fanningert/wol-server.git
-	sha512sums = 913520d8972d7d91d0f78d14b21e511f87c8e0f5a6860242f9ec01e5c1f3791a1c0b7b83a59b5c1c7846db58905e55846d08db9e3aa849fada7e45ea0ddad6fc
-	sha512sums = beb090067f0f08371e049a940fe4c3f5de7aead3763366a25814a4424d761624558ffe3fc5447e9f9efbe5bde85b87a77c2fed1958f202adeaaee930f91d45d4
+	sha512sums = 5df3bdc1cf04fd6a83fbe1bca6e8edfd9034f26214f79598eebb1f3bdbac79df53b5fa89e97705c5dd15030ea587a1d85072708ead08c84c61662fa71d2db91b
+	sha512sums = 5d0e3d8f40f87ea9b3ed84c57eb2af937c330c1faddda008c0fe31bdc0f19a6c0a02d1ea04bd96bd7ba6cb93235f3a5c1fa6ea7c04258ee305c44b6ea6535b8b
 	sha512sums = SKIP
 
 pkgname = go-wol-server-git
diff --git a/PKGBUILD b/PKGBUILD
index bd39edaf18c3..726dbe56983e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 pkgname=go-wol-server-git
 _pkgname=go-wol-server
 url="https://github.com/fanningert/wol-server"
-pkgver=0.2
-pkgrel=3
+pkgver=23.1d7b0ba
+pkgrel=1
 epoch=1
 pkgdesc="Wake on Lan server"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
@@ -15,10 +15,7 @@ provides=('go-wol-server')
 makedepends=('go>=1.2' 'git')
 conflicts=()
 options=('!strip' '!emptydirs')
-backup=('etc/go-wol-server/config.toml'
-        'etc/go-wol-server/templates/footer.tmpl'
-        'etc/go-wol-server/templates/header.tmpl'
-        'etc/go-wol-server/templates/index.tmpl')
+backup=('etc/go-wol-server/config.toml')
 
 _gourl=github.com/fanningert
 _gourl_pkgname=wol-server
@@ -26,10 +23,15 @@ source=('go-wol-server.service'
         'config.toml'
         "${_gourl_pkgname}::git+https://${_gourl}/${_gourl_pkgname}.git")
 
-sha512sums=('913520d8972d7d91d0f78d14b21e511f87c8e0f5a6860242f9ec01e5c1f3791a1c0b7b83a59b5c1c7846db58905e55846d08db9e3aa849fada7e45ea0ddad6fc'
-            'beb090067f0f08371e049a940fe4c3f5de7aead3763366a25814a4424d761624558ffe3fc5447e9f9efbe5bde85b87a77c2fed1958f202adeaaee930f91d45d4'
+sha512sums=('5df3bdc1cf04fd6a83fbe1bca6e8edfd9034f26214f79598eebb1f3bdbac79df53b5fa89e97705c5dd15030ea587a1d85072708ead08c84c61662fa71d2db91b'
+            '5d0e3d8f40f87ea9b3ed84c57eb2af937c330c1faddda008c0fe31bdc0f19a6c0a02d1ea04bd96bd7ba6cb93235f3a5c1fa6ea7c04258ee305c44b6ea6535b8b'
             'SKIP')
 
+pkgver(){
+  cd "$srcdir/../${_gourl_pkgname}"
+  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+}
+
 prepare() {
   mkdir -p "${srcdir}/src/${_gourl}"
   mv "${_gourl_pkgname}" "${srcdir}/src/${_gourl}"
@@ -48,7 +50,8 @@ package() {
   install -D -m 0755 "${srcdir}/src/${_gourl}/${_gourl_pkgname}/${_gourl_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
   
   install -D -m 0600 "${srcdir}/config.toml" "$pkgdir/etc/${_pkgname}/config.toml"
-  cp -r "${srcdir}/src/${_gourl}/${_gourl_pkgname}/templates" "${pkgdir}/etc/${_pkgname}/templates"
+  mkdir -p "${pkgdir}/usr/share/themes/${_pkgname}/templates"
+  mv "${srcdir}/src/${_gourl}/${_gourl_pkgname}/templates" "${pkgdir}/usr/share/themes/${_pkgname}/templates/default"
   
   install -D -m 0644 "${srcdir}/${_pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service"
 }
diff --git a/config.toml b/config.toml
index 91f723cd68ea..dbe418afc69c 100644
--- a/config.toml
+++ b/config.toml
@@ -1,4 +1,13 @@
+[core]
+Address = "127.0.0.1:8080"
+ExternalURL = ""
+TemplateDir = "/usr/share/themes/go-wol-server/templates/default"
+
+[core.html]
+Title = "Go WakeOnLan server"
+
 [workstations]
-	[workstations.vaih-workstation-1]
-	MAC = "14:da:e9:de:d5:0b"
-	IP = "100.126.240.33"
\ No newline at end of file
+
+[workstations.vaih-workstation-1]
+MAC = "14:da:e9:de:d5:0b"
+IP = "100.126.240.33"
\ No newline at end of file
diff --git a/go-wol-server.service b/go-wol-server.service
index dea7d1d43a39..de76a8f4df2f 100644
--- a/go-wol-server.service
+++ b/go-wol-server.service
@@ -3,7 +3,7 @@ Description=Wake on Lan Service
 
 [Service]
 TimeoutStartSec=0
-ExecStart=/usr/bin/go-wol-server -configFile=/etc/go-wol-server/config.toml -templateDir=/etc/go-wol-server/templates/ -remoteRoot=/ -listen=127.0.0.1:8080
+ExecStart=/usr/bin/go-wol-server -config=/etc/go-wol-server/config.toml
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file