v. 2.9.1

1 files changed, 51 insertions, 32 deletions

diff --git a/configuration b/configuration
index 564b45bf0fcd..c11c2014411b 100644
--- a/configuration
+++ b/configuration
@@ -1,66 +1,85 @@
 Pi-hole Archlinux configuration instructions
 Server version
-rev. 0.3
+rev. 0.4
 
 Pi-Hole Web server admin page: http://<server-ip>/admin
 It is possible to add custom ad-list server in /etc/pihole/adlists.list
 
-
 Instructions below assume ArchLinux default system config files are untouched or modified only by removing comments (#)
 
 
+A) First install steps
+
+  *** if you already use dnsmasq and it's functional
+
+    1) copy pi-hole include config lines in right place
+
+    # mkdir /etc/dnsmasq.d
+    # cp /etc/pihole/configs/dnsmasq.include /etc/dnsmasq.d/pihole.conf
+
+    2) edit your /etc/dnsmasq.conf to uncomment last line (including new pi-hole config lines)
+
+    # sed -i 's|#conf-dir=/etc/dnsmasq.d/,\*.conf|conf-dir=/etc/dnsmasq.d/,\*.conf|' /etc/dnsmasq.conf
+
+  *** end if
 
-*** if you already use dnsmasq and it's functional
+  *** if you installed dnsmasq with this package for the first time
 
-1) copy pi-hole include config lines in right place
+    3) backup original dnsmasq config file and copy pi-hole one
 
-# mkdir /etc/dnsmasq.d
-# cp /etc/pihole/configs/dnsmasq.include /etc/dnsmasq.d/pihole.conf
+    # cp /etc/dnsmasq.conf /etc/dnsmasq.orig
+    # cp /etc/pihole/configs/dnsmasq.complete /etc/dnsmasq.conf
 
-2) edit your /etc/dnsmasq.conf to uncomment last line (including new pi-hole config lines)
+  *** end if
 
-# sed -i 's|#conf-dir=/etc/dnsmasq.d/,\*.conf|conf-dir=/etc/dnsmasq.d/,\*.conf|' /etc/dnsmasq.conf
+  4) lighttpd need port 80 to be free. backup original config file and copy pi-hole one
 
-*** end if
+  # cp /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.orig
+  # cp /etc/pihole/configs/lighttpd.conf /etc/lighttpd/lighttpd.conf
 
+  5) enable and start dnsmasq service
 
+  # systemctl reenable dnsmasq.service
+  # systemctl restart dnsmasq.service
 
-*** if you installed dnsmasq with this package for the first time
+  6) enable and start lighttpd service
 
-3) backup original dnsmasq config file and copy pi-hole one
+  # systemctl reenable lighttpd.service
+  # systemctl restart lighttpd.service
 
-# cp /etc/dnsmasq.conf /etc/dnsmasq.orig
-# cp /etc/pihole/configs/dnsmasq.complete /etc/dnsmasq.conf
+  7) FUNDAMENTAL: point dns resolution of your lan clients to this machine
 
-*** end if
 
+B) Upgrade steps
 
+  *** if updating you see a post install message like this: " ==> ver. -current upgraded version-: -dnsmasq or lighttpd- conf file is changed, please follow configuration upgrade steps "
 
-4) lighttpd need port 80 to be free. backup original config file and copy pi-hole one
+    1) update dnsmasq conf file
 
-# cp /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.orig
-# cp /etc/pihole/configs/lighttpd.conf /etc/lighttpd/lighttpd.conf
+    # [ -f /etc/dnsmasq.d/pihole.conf ] && cp /etc/pihole/configs/dnsmasq.include /etc/dnsmasq.d/pihole.conf
+    # [ -f /etc/dnsmasq.orig ] && cp /etc/pihole/configs/dnsmasq.complete /etc/dnsmasq.conf
 
-5) enable and start dnsmasq service
+    2) update lighttpd conf file
 
-# systemctl reenable dnsmasq.service
-# systemctl restart dnsmasq.service
+    # [ -f /etc/lighttpd/lighttpd.conf ] && cp /etc/pihole/configs/lighttpd.conf /etc/lighttpd/lighttpd.conf
 
-6) enable and start lighttpd service
+    3) manage and restart dnsmasq and lighttpd service
 
-# systemctl reenable lighttpd.service
-# systemctl restart lighttpd.service
+    # systemctl reenable dnsmasq.service
+    # systemctl restart dnsmasq.service
+    # systemctl reenable lighttpd.service
+    # systemctl restart lighttpd.service
 
-7) FUNDAMENTAL: point dns resolution of your lan clients to this machine
+  *** end if
 
 
-UNINSTALL steps
+C) Uninstall steps
 
-# systemctl stop dnsmasq.service
-# systemctl disable dnsmasq.service
-# systemctl stop lighttpd.service
-# systemctl disable lighttpd.service
-# [ -f /etc/dnsmasq.d/pihole.conf ] && rm /etc/dnsmasq.d/pihole.conf
-# [ -f /etc/dnsmasq.orig ] && cp /etc/dnsmasq.orig /etc/dnsmasq.conf
-# [ -f /etc/lighttpd/lighttpd.orig ] && cp /etc/lighttpd/lighttpd.orig /etc/lighttpd/lighttpd.conf
+  # systemctl stop dnsmasq.service
+  # systemctl disable dnsmasq.service
+  # systemctl stop lighttpd.service
+  # systemctl disable lighttpd.service
+  # [ -f /etc/dnsmasq.d/pihole.conf ] && rm /etc/dnsmasq.d/pihole.conf
+  # [ -f /etc/dnsmasq.orig ] && cp /etc/dnsmasq.orig /etc/dnsmasq.conf
+  # [ -f /etc/lighttpd/lighttpd.orig ] && cp /etc/lighttpd/lighttpd.orig /etc/lighttpd/lighttpd.conf