From 693997de8c9e2c44de65b03de4074d67ebd9a0ae Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Wed, 20 Jul 2016 22:03:01 +0200 Subject: [PATCH 1/2] Add VIRTUAL_HOST as dnsmasq lookup Add VIRTUAL_HOST env value to dnsmasq lookup for internal lookup --- .../alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh | 7 ++++++- .../centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh | 7 ++++++- .../debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh | 7 ++++++- .../debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh | 7 ++++++- .../debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh | 7 ++++++- .../ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh | 7 ++++++- .../ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh | 7 ++++++- .../ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh | 7 ++++++- .../ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh | 7 ++++++- .../ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh | 7 ++++++- .../latest/conf/bin/service.d/dnsmasq.d/10-init.sh | 7 ++++++- .../base-app/general/bin/service.d/dnsmasq.d/10-init.sh | 7 ++++++- 12 files changed, 72 insertions(+), 12 deletions(-) diff --git a/docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh index 51aa805d8..9ef54af5a 100644 --- a/docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh +++ b/docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -1,5 +1,5 @@ ## clear dns file -echo > /etc/dnsmasq.d/development +echo > /etc/dnsmasq.d/webdevops if [ ! -f /etc/resolv.conf.original ]; then cp -a /etc/resolv.conf /etc/resolv.conf.original @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then ## set dnsmasq to main nameserver echo "nameserver 127.0.0.1" > /etc/resolv.conf fi + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops +fi diff --git a/docker/base-app/centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base-app/centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh index 51aa805d8..9ef54af5a 100644 --- a/docker/base-app/centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh +++ b/docker/base-app/centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -1,5 +1,5 @@ ## clear dns file -echo > /etc/dnsmasq.d/development +echo > /etc/dnsmasq.d/webdevops if [ ! -f /etc/resolv.conf.original ]; then cp -a /etc/resolv.conf /etc/resolv.conf.original @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then ## set dnsmasq to main nameserver echo "nameserver 127.0.0.1" > /etc/resolv.conf fi + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops +fi diff --git a/docker/base-app/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base-app/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh index 51aa805d8..9ef54af5a 100644 --- a/docker/base-app/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh +++ b/docker/base-app/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -1,5 +1,5 @@ ## clear dns file -echo > /etc/dnsmasq.d/development +echo > /etc/dnsmasq.d/webdevops if [ ! -f /etc/resolv.conf.original ]; then cp -a /etc/resolv.conf /etc/resolv.conf.original @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then ## set dnsmasq to main nameserver echo "nameserver 127.0.0.1" > /etc/resolv.conf fi + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops +fi diff --git a/docker/base-app/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base-app/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh index 51aa805d8..9ef54af5a 100644 --- a/docker/base-app/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh +++ b/docker/base-app/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -1,5 +1,5 @@ ## clear dns file -echo > /etc/dnsmasq.d/development +echo > /etc/dnsmasq.d/webdevops if [ ! -f /etc/resolv.conf.original ]; then cp -a /etc/resolv.conf /etc/resolv.conf.original @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then ## set dnsmasq to main nameserver echo "nameserver 127.0.0.1" > /etc/resolv.conf fi + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops +fi diff --git a/docker/base-app/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base-app/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh index 51aa805d8..9ef54af5a 100644 --- a/docker/base-app/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh +++ b/docker/base-app/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -1,5 +1,5 @@ ## clear dns file -echo > /etc/dnsmasq.d/development +echo > /etc/dnsmasq.d/webdevops if [ ! -f /etc/resolv.conf.original ]; then cp -a /etc/resolv.conf /etc/resolv.conf.original @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then ## set dnsmasq to main nameserver echo "nameserver 127.0.0.1" > /etc/resolv.conf fi + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops +fi diff --git a/docker/base-app/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base-app/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh index 51aa805d8..9ef54af5a 100644 --- a/docker/base-app/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh +++ b/docker/base-app/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -1,5 +1,5 @@ ## clear dns file -echo > /etc/dnsmasq.d/development +echo > /etc/dnsmasq.d/webdevops if [ ! -f /etc/resolv.conf.original ]; then cp -a /etc/resolv.conf /etc/resolv.conf.original @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then ## set dnsmasq to main nameserver echo "nameserver 127.0.0.1" > /etc/resolv.conf fi + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops +fi diff --git a/docker/base-app/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base-app/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh index 51aa805d8..9ef54af5a 100644 --- a/docker/base-app/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh +++ b/docker/base-app/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -1,5 +1,5 @@ ## clear dns file -echo > /etc/dnsmasq.d/development +echo > /etc/dnsmasq.d/webdevops if [ ! -f /etc/resolv.conf.original ]; then cp -a /etc/resolv.conf /etc/resolv.conf.original @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then ## set dnsmasq to main nameserver echo "nameserver 127.0.0.1" > /etc/resolv.conf fi + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops +fi diff --git a/docker/base-app/ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base-app/ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh index 51aa805d8..9ef54af5a 100644 --- a/docker/base-app/ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh +++ b/docker/base-app/ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -1,5 +1,5 @@ ## clear dns file -echo > /etc/dnsmasq.d/development +echo > /etc/dnsmasq.d/webdevops if [ ! -f /etc/resolv.conf.original ]; then cp -a /etc/resolv.conf /etc/resolv.conf.original @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then ## set dnsmasq to main nameserver echo "nameserver 127.0.0.1" > /etc/resolv.conf fi + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops +fi diff --git a/docker/base-app/ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base-app/ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh index 51aa805d8..9ef54af5a 100644 --- a/docker/base-app/ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh +++ b/docker/base-app/ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -1,5 +1,5 @@ ## clear dns file -echo > /etc/dnsmasq.d/development +echo > /etc/dnsmasq.d/webdevops if [ ! -f /etc/resolv.conf.original ]; then cp -a /etc/resolv.conf /etc/resolv.conf.original @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then ## set dnsmasq to main nameserver echo "nameserver 127.0.0.1" > /etc/resolv.conf fi + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops +fi diff --git a/docker/base-app/ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base-app/ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh index 51aa805d8..9ef54af5a 100644 --- a/docker/base-app/ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh +++ b/docker/base-app/ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -1,5 +1,5 @@ ## clear dns file -echo > /etc/dnsmasq.d/development +echo > /etc/dnsmasq.d/webdevops if [ ! -f /etc/resolv.conf.original ]; then cp -a /etc/resolv.conf /etc/resolv.conf.original @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then ## set dnsmasq to main nameserver echo "nameserver 127.0.0.1" > /etc/resolv.conf fi + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops +fi diff --git a/docker/samson-deployment/latest/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/dnsmasq.d/10-init.sh index 51aa805d8..9ef54af5a 100644 --- a/docker/samson-deployment/latest/conf/bin/service.d/dnsmasq.d/10-init.sh +++ b/docker/samson-deployment/latest/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -1,5 +1,5 @@ ## clear dns file -echo > /etc/dnsmasq.d/development +echo > /etc/dnsmasq.d/webdevops if [ ! -f /etc/resolv.conf.original ]; then cp -a /etc/resolv.conf /etc/resolv.conf.original @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then ## set dnsmasq to main nameserver echo "nameserver 127.0.0.1" > /etc/resolv.conf fi + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops +fi diff --git a/provisioning/base-app/general/bin/service.d/dnsmasq.d/10-init.sh b/provisioning/base-app/general/bin/service.d/dnsmasq.d/10-init.sh index 51aa805d8..9ef54af5a 100644 --- a/provisioning/base-app/general/bin/service.d/dnsmasq.d/10-init.sh +++ b/provisioning/base-app/general/bin/service.d/dnsmasq.d/10-init.sh @@ -1,5 +1,5 @@ ## clear dns file -echo > /etc/dnsmasq.d/development +echo > /etc/dnsmasq.d/webdevops if [ ! -f /etc/resolv.conf.original ]; then cp -a /etc/resolv.conf /etc/resolv.conf.original @@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then ## set dnsmasq to main nameserver echo "nameserver 127.0.0.1" > /etc/resolv.conf fi + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops +fi From 51091d502d90974fbfad696fb5bf631db5d94c77 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Wed, 20 Jul 2016 23:33:15 +0200 Subject: [PATCH 2/2] Enable dnsmasq by default for base-app --- docker/base-app/alpine-3/conf/etc/supervisor.d/dnsmasq.conf | 2 +- docker/base-app/centos-7/conf/etc/supervisor.d/dnsmasq.conf | 2 +- docker/base-app/debian-7/conf/etc/supervisor.d/dnsmasq.conf | 2 +- docker/base-app/debian-8/conf/etc/supervisor.d/dnsmasq.conf | 2 +- docker/base-app/debian-9/conf/etc/supervisor.d/dnsmasq.conf | 2 +- docker/base-app/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf | 2 +- docker/base-app/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf | 2 +- docker/base-app/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf | 2 +- docker/base-app/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf | 2 +- docker/base-app/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf | 2 +- .../samson-deployment/latest/conf/etc/supervisor.d/dnsmasq.conf | 2 +- provisioning/base-app/general/etc/supervisor.d/dnsmasq.conf | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docker/base-app/alpine-3/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/alpine-3/conf/etc/supervisor.d/dnsmasq.conf index 9832ffca7..a0ad2de88 100644 --- a/docker/base-app/alpine-3/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/base-app/alpine-3/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = false +autostart = true autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base-app/centos-7/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/centos-7/conf/etc/supervisor.d/dnsmasq.conf index 9832ffca7..a0ad2de88 100644 --- a/docker/base-app/centos-7/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/base-app/centos-7/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = false +autostart = true autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base-app/debian-7/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/debian-7/conf/etc/supervisor.d/dnsmasq.conf index 9832ffca7..a0ad2de88 100644 --- a/docker/base-app/debian-7/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/base-app/debian-7/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = false +autostart = true autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base-app/debian-8/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/debian-8/conf/etc/supervisor.d/dnsmasq.conf index 9832ffca7..a0ad2de88 100644 --- a/docker/base-app/debian-8/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/base-app/debian-8/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = false +autostart = true autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base-app/debian-9/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/debian-9/conf/etc/supervisor.d/dnsmasq.conf index 9832ffca7..a0ad2de88 100644 --- a/docker/base-app/debian-9/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/base-app/debian-9/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = false +autostart = true autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base-app/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf index 9832ffca7..a0ad2de88 100644 --- a/docker/base-app/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/base-app/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = false +autostart = true autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base-app/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf index 9832ffca7..a0ad2de88 100644 --- a/docker/base-app/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/base-app/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = false +autostart = true autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base-app/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf index 9832ffca7..a0ad2de88 100644 --- a/docker/base-app/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/base-app/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = false +autostart = true autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base-app/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf index 9832ffca7..a0ad2de88 100644 --- a/docker/base-app/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/base-app/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = false +autostart = true autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base-app/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf index 9832ffca7..a0ad2de88 100644 --- a/docker/base-app/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/base-app/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = false +autostart = true autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.d/dnsmasq.conf b/docker/samson-deployment/latest/conf/etc/supervisor.d/dnsmasq.conf index 9832ffca7..a0ad2de88 100644 --- a/docker/samson-deployment/latest/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/samson-deployment/latest/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = false +autostart = true autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/provisioning/base-app/general/etc/supervisor.d/dnsmasq.conf b/provisioning/base-app/general/etc/supervisor.d/dnsmasq.conf index 9832ffca7..a0ad2de88 100644 --- a/provisioning/base-app/general/etc/supervisor.d/dnsmasq.conf +++ b/provisioning/base-app/general/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = false +autostart = true autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0