Merge pull request #39 from diginc/ipv6_disable_flag
quick alpine addition of ipv6 toggle off flag
This commit is contained in:
commit
7bf5ba3d7c
|
@ -58,6 +58,9 @@ ENV PHP_ENV_CONFIG '/etc/php5/fpm.d/envs.conf'
|
|||
ENV PHP_ERROR_LOG '/var/log/nginx/error.log'
|
||||
COPY ./alpine/start.sh /
|
||||
|
||||
# IPV6 disable flag for networks/devices that do not support it
|
||||
ENV IPv6 True
|
||||
|
||||
EXPOSE 53 53/udp
|
||||
EXPOSE 80
|
||||
|
||||
|
|
|
@ -31,6 +31,13 @@ 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 && \
|
||||
|
||||
ip_versions="IPv4 and IPv6"
|
||||
if [ "$IPv6" != "True" ] ; then
|
||||
ip_versions="IPv4"
|
||||
sed -i '/listen \[::\]:80;/ d' /etc/nginx/nginx.conf
|
||||
fi;
|
||||
echo "Using $ip_versions"
|
||||
|
||||
dnsmasq --test -7 /etc/dnsmasq.d || exit 1
|
||||
php-fpm -t || exit 1
|
||||
nginx -t || exit 1
|
||||
|
|
|
@ -61,6 +61,10 @@ ENV PHP_ENV_CONFIG '/etc/lighttpd/conf-enabled/15-fastcgi-php.conf'
|
|||
ENV PHP_ERROR_LOG '/var/log/lighttpd/error.log'
|
||||
COPY ./debian/start.sh /
|
||||
|
||||
# IPV6 disable flag for networks/devices that do not support it
|
||||
# not fully supported in debian yet
|
||||
ENV IPv6 True
|
||||
|
||||
EXPOSE 53 53/udp
|
||||
EXPOSE 80
|
||||
|
||||
|
|
Loading…
Reference in New Issue