php whitelist/blacklist still not quite working but closer

AdminLTE

@@ -1 +1 @@
-Subproject commit 507f4fa791edfe4e632deb607319b529217d8fca
+Subproject commit 62e898e82c601e7f58ded01bd031e444843dd125

alpine.docker

@@ -6,7 +6,7 @@ RUN apk add --update \
         nginx \
         ca-certificates \
         php5-fpm php5-json php5-openssl libxml2 \
-        bc bash curl perl && \
+        bc bash curl perl sudo && \
     apk add --update --repository http://dl-1.alpinelinux.org/alpine/edge/testing/ tini && \
     rm -rf /var/cache/apk/*
 
@@ -21,6 +21,7 @@ RUN mkdir -p /opt/ && ln -s /usr/local/bin /opt/pihole
 COPY ./pi-hole/advanced/dnsmasq.conf.original /etc/dnsmasq.conf
 COPY ./pi-hole/advanced/01-pihole.conf /etc/dnsmasq.d/
 COPY ./pi-hole/advanced/index.html /var/www/html/pihole/index.html
+COPY ./pi-hole/advanced/pihole.sudo /etc/sudoers.d/pihole
 COPY ./AdminLTE /var/www/html/admin
 COPY ./AdminLTE_version.txt /etc/
 COPY ./pi-hole_version.txt /etc/

debian.docker

@@ -13,8 +13,8 @@ RUN apt-get -q update && \
     apt-get install -y \
         dnsmasq \
         lighttpd \
-        php5-common php5-cgi php5-openssl php5 \
-        bc curl unzip wget && \
+        php5-common php5-cgi php5 \
+        bc curl unzip wget sudo && \
     rm -rf /var/cache/apt/archives
 
 # Original upstream pihole code being used
@@ -27,6 +27,7 @@ COPY ./pi-hole/advanced/lighttpd.conf /etc/lighttpd/lighttpd.conf
 COPY ./pi-hole/advanced/dnsmasq.conf.original /etc/dnsmasq.conf
 COPY ./pi-hole/advanced/01-pihole.conf /etc/dnsmasq.d/
 COPY ./pi-hole/advanced/index.html /var/www/html/pihole/index.html
+COPY ./pi-hole/advanced/pihole.sudo /etc/sudoers.d/pihole
 COPY ./AdminLTE /var/www/html/admin
 COPY ./AdminLTE_version.txt /etc/
 COPY ./pi-hole_version.txt /etc/

debian/start.sh

@@ -14,6 +14,13 @@ if [ "$DNS1" != '8.8.8.8' ] || [ "$DNS2" != '8.8.4.4' ] ; then
   dnsType='custom'
 fi;
 
+if [ -n "$VIRTUAL_HOST" ] ; then
+  PHP_CONFIG='/etc/lighttpd/conf-enabled/15-fastcgi-php.conf'
+  sed -i "/bin-environment/ a\\\t\t\t\"VIRTUAL_HOST\" => \"${VIRTUAL_HOST}\"," $PHP_CONFIG
+  echo "Added ENV to php:"
+  grep 'VIRTUAL_HOST' $PHP_CONFIG
+fi;
+
 echo "Using $dnsType DNS servers: $DNS1 & $DNS2"
 sed -i "s/@DNS1@/$DNS1/" /etc/dnsmasq.d/01-pihole.conf && \
 sed -i "s/@DNS2@/$DNS2/" /etc/dnsmasq.d/01-pihole.conf && \

docker_dev.sh

@@ -11,5 +11,6 @@ docker run -it --rm --cap-add=NET_ADMIN \
   -p 5053:53/udp \
   -p 5080:80 \
   -e ServerIP="$IP" \
+  -e VIRTUAL_HOST='pihole.diginc.lan:5080' \
   $@ \
   diginc/pi-hole:${image:-alpine}