ver. 2.4

7 files changed, 38 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48c488903542..6d68beffa184 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Jan 13 12:50:39 UTC 2016
+# Tue Jan 26 23:26:43 UTC 2016
 pkgbase = pi-hole-server
 	pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.
-	pkgver = 2.2
+	pkgver = 2.4
 	pkgrel = 1
 	url = https://github.com/jacobsalmela/pi-hole
 	install = pi-hole-server.install
@@ -12,10 +12,11 @@ pkgbase = pi-hole-server
 	depends = dnsmasq
 	depends = lighttpd
 	depends = php-cgi
+	depends = bc
+	depends = figlet
 	conflicts = pi-hole-server
-	source = https://github.com/jacobsalmela/pi-hole/archive/v2.2.tar.gz
+	source = https://github.com/jacobsalmela/pi-hole/archive/v2.4.tar.gz
 	source = https://github.com/jacobsalmela/AdminLTE/archive/master.zip
-	source = https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html
 	source = configuration
 	source = dnsmasq.include
 	source = dnsmasq.complete
@@ -25,18 +26,17 @@ pkgbase = pi-hole-server
 	source = pi-hole-weekly.cron
 	source = whitelist.txt
 	source = blacklist.txt
-	md5sums = 8387d55bc37b661827ad614701157b19
-	md5sums = 807c8cd98cfba066dac9b16ff0e08c8e
-	md5sums = 58d5c6d200e4bdf990e04d7dbfc3cf57
-	md5sums = c01b982f3ef13c5fe140cc242a3b627b
+	md5sums = b051dc1bd79182262336ce8bc11fb816
+	md5sums = ef69a57624685ef11c265785e914782b
+	md5sums = 77e128965dbc7e94a31a908f58a5aa6c
 	md5sums = fd607f890103e97e480d814a5dfbee5b
 	md5sums = 06bb49cf66cc1db8be5e476a54b1e933
-	md5sums = 4f5f6076d358c1375525e6ab481dfb7d
+	md5sums = 29aab2a7cdc82097b719935c01698777
 	md5sums = 564f47c5cfab0a1b7b010ddbcf8e3b84
 	md5sums = 8f99cfaae99f1542788dfbd7a39b5603
 	md5sums = a2d0530954e8eb19592f686e29c24c45
-	md5sums = 534de24fb56acfd3b451cf4b1b382218
-	md5sums = 534de24fb56acfd3b451cf4b1b382218
+	md5sums = d41d8cd98f00b204e9800998ecf8427e
+	md5sums = d41d8cd98f00b204e9800998ecf8427e
 
 pkgname = pi-hole-server
 
diff --git a/PKGBUILD b/PKGBUILD
index 72c52c49f420..5f9f1ee0e73b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,18 @@
 
 pkgname=pi-hole-server
 _pkgname=pi-hole
-pkgver=2.2
+pkgver=2.4
 pkgrel=1
 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.'
 arch=('any')
 license=('GPL2')
 url="https://github.com/jacobsalmela/pi-hole"
-depends=('cron' 'dnsmasq' 'lighttpd' 'php-cgi')
+depends=('cron' 'dnsmasq' 'lighttpd' 'php-cgi' 'bc' 'figlet')
 conflicts=('pi-hole-server')
 install=$pkgname.install
 
 source=(https://github.com/jacobsalmela/$_pkgname/archive/v$pkgver.tar.gz
 	https://github.com/jacobsalmela/AdminLTE/archive/master.zip
-	https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html
 	configuration
 	dnsmasq.include
 	dnsmasq.complete
@@ -25,31 +24,41 @@ source=(https://github.com/jacobsalmela/$_pkgname/archive/v$pkgver.tar.gz
 	whitelist.txt
 	blacklist.txt)
 
-md5sums=('8387d55bc37b661827ad614701157b19'
-         '807c8cd98cfba066dac9b16ff0e08c8e'
-         '58d5c6d200e4bdf990e04d7dbfc3cf57'
-         'c01b982f3ef13c5fe140cc242a3b627b'
+md5sums=('b051dc1bd79182262336ce8bc11fb816'
+         'ef69a57624685ef11c265785e914782b'
+         '77e128965dbc7e94a31a908f58a5aa6c'
          'fd607f890103e97e480d814a5dfbee5b'
          '06bb49cf66cc1db8be5e476a54b1e933'
-         '4f5f6076d358c1375525e6ab481dfb7d'
+         '29aab2a7cdc82097b719935c01698777'
          '564f47c5cfab0a1b7b010ddbcf8e3b84'
          '8f99cfaae99f1542788dfbd7a39b5603'
          'a2d0530954e8eb19592f686e29c24c45'
-         '534de24fb56acfd3b451cf4b1b382218'
-         '534de24fb56acfd3b451cf4b1b382218')
+         'd41d8cd98f00b204e9800998ecf8427e'
+         'd41d8cd98f00b204e9800998ecf8427e')
 
 prepare() {
   # modify service management
-  sed -i 's|^		sudo service dnsmasq start|		systemctl start dnsmasq|' "$srcdir"/$_pkgname-$pkgver/gravity.sh
+  sed -i 's|^		\$SUDO service dnsmasq start|		$SUDO systemctl start dnsmasq|' "$srcdir"/$_pkgname-$pkgver/gravity.sh
 
-  # change log location in admin php interface
+  # change log location in admin php interface and scripts
   sed -i 's|/var/log/pihole.log|/run/log/pihole.log|' "$srcdir"/AdminLTE-master/index.php
   sed -i 's|/var/log/pihole.log|/run/log/pihole.log|' "$srcdir"/AdminLTE-master/api.php
+  sed -i 's|/var/log/pihole.log|/run/log/pihole.log|' "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/chronometer.sh
+
+  # original toilet util is in aur, enter figlet
+  sed -i 's|		toilet -f small -F gay Pi-hole|		figlet Pi-hole|' "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/chronometer.sh
+
+  # change bin location in admin php interface
+  sed -i 's|/usr/local/bin/|/usr/bin/|' "$srcdir"/AdminLTE-master/index.php
+  sed -i 's|/usr/local/bin/|/usr/bin/|' "$srcdir"/AdminLTE-master/api.php
 }
 
 package() {
   cd "$srcdir"
   install -Dm755 ./$_pkgname-$pkgver/gravity.sh "$pkgdir"/usr/bin/gravity.sh || return 1
+  install -Dm755 ./$_pkgname-$pkgver/advanced/Scripts/chronometer.sh "$pkgdir"/usr/bin/chronometer.sh || return 1
+  install -Dm755 ./$_pkgname-$pkgver/advanced/Scripts/blacklist.sh "$pkgdir"/usr/bin/blacklist.sh || return 1
+  install -Dm755 ./$_pkgname-$pkgver/advanced/Scripts/whitelist.sh "$pkgdir"/usr/bin/whitelist.sh || return 1
   install -Dm755 $_pkgname-daily.cron "$pkgdir"/etc/cron.daily/$_pkgname-daily || return 1
   install -Dm755 $_pkgname-weekly.cron "$pkgdir"/etc/cron.weekly/$_pkgname-weekly || return 1
   install -Dm644 pi-hole.tmpfile "$pkgdir"/etc/tmpfiles.d/pi-hole.conf || return 1
@@ -64,7 +73,7 @@ package() {
   install -Dm644 configuration "$pkgdir"/usr/share/doc/pihole/configuration || return 1
 
   install -dm755 "$pkgdir"/srv/http/pihole/admin || return 1
-  install -Dm644 index.html "$pkgdir"/srv/http/pihole/index.html || return 1
+  install -Dm644 ./$_pkgname-$pkgver/advanced/index.html "$pkgdir"/srv/http/pihole/index.html || return 1
   cp -dpr --no-preserve=ownership AdminLTE-master/* "$pkgdir"/srv/http/pihole/admin/
 }
 
diff --git a/blacklist.txt b/blacklist.txt
index ba4561648acb..e69de29bb2d1 100644
--- a/blacklist.txt
+++ b/blacklist.txt
@@ -1 +0,0 @@
-# one domain per line
diff --git a/configuration b/configuration
index 98273143bcc8..9800cb68eb20 100644
--- a/configuration
+++ b/configuration
@@ -1,6 +1,6 @@
 Pi-hole Archlinux configuration instructions
 Server version
-rev. 0.1
+rev. 0.2
 
 Pi-Hole Web server admin page: http://<server-ip>/admin
 
@@ -47,8 +47,8 @@ Instructions below assume ArchLinux default system config files are untouched or
 
 6) enable and start lighttpd service
 
-# systemctl enable lighttpd.service
-# systemctl start lighttpd.service
+# systemctl reenable lighttpd.service
+# systemctl restart lighttpd.service
 
 7) FUNDAMENTAL: point dns resolution of your lan clients to this machine
 
diff --git a/lighttpd.conf b/lighttpd.conf
index 98d96fbe8e46..d84422d707e5 100644
--- a/lighttpd.conf
+++ b/lighttpd.conf
@@ -58,11 +58,5 @@ $HTTP["url"] =~ "^/admin/" {
 $HTTP["url"] =~ "^(?!/admin)/.*" {
 	# Create a response header for debugging using curl -I
 	setenv.add-response-header = ( "X-Pi-hole" => "A black hole for Internet advertisements." )
-
-	# Set the cache to 1 day for better performance
-	expire.url = ("" => "access plus 1 days")
-
-	# Send the query into the black hole
-	url.rewrite = (".*" => "index.html" )
 }
 
diff --git a/pi-hole-server.install b/pi-hole-server.install
index 910aa0c435ad..e0514cf8e758 100644
--- a/pi-hole-server.install
+++ b/pi-hole-server.install
@@ -1,12 +1,11 @@
 post_install() {
   cat <<- EOF
     ==> please read configuration instructions at /usr/share/doc/pihole/configuration
+    ==> lighttpd config file is changed. please uninstall and reinstall following configuration steps.
     ==> first install/update run...
 EOF
   chown -R http.http /srv/http/pihole
-  touch /run/log/pihole.log
-  chmod 644 /run/log/pihole.log
-  chown dnsmasq.root /run/log/pihole.log
+  systemd-tmpfiles --create pi-hole.conf
   /usr/bin/gravity.sh > /dev/null
 }
 
diff --git a/whitelist.txt b/whitelist.txt
index ba4561648acb..e69de29bb2d1 100644
--- a/whitelist.txt
+++ b/whitelist.txt
@@ -1 +0,0 @@
-# one domain per line