✨ Add VIRTUAL_HOST env value to dnsmasq lookup for internal lookup (#119)

mblaschke · guiyomh · commit be5ad579b9a2 · 2016-09-08T23:12:12.000+02:00
* Add VIRTUAL_HOST as dnsmasq lookup
* Enable dnsmasq by default for base-app
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
@@ -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/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/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/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/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-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/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-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/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/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/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-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/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-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/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.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/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-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/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/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/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/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/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
diff --git 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
