Skip to content

Commit 751beda

Browse files
mblaschkemblaschke
committed
Add multiple vhost support for dns lookup
VIRTUAL_HOST with multiple domains as comma separated values
1 parent 72a64a2 commit 751beda

File tree

12 files changed

+144
-12
lines changed
  • docker
    • base-app
    • samson-deployment/latest/conf/bin/service.d/dnsmasq.d
  • provisioning/base-app/general/bin/service.d/dnsmasq.d

12 files changed

+144
-12
lines changed

‎docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,16 @@ fi
1717

1818
# Add own VIRTUAL_HOST as loopback
1919
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
20-
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
20+
# split comma by space
21+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'}
22+
23+
# replace *.domain for dns specific .domain wildcard
24+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.}
25+
26+
# no support for .*
27+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.}
28+
29+
for DOMAIN in $VIRTUAL_HOST_LIST; do
30+
echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
31+
done
2132
fi

‎docker/base-app/centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,16 @@ fi
1717

1818
# Add own VIRTUAL_HOST as loopback
1919
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
20-
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
20+
# split comma by space
21+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'}
22+
23+
# replace *.domain for dns specific .domain wildcard
24+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.}
25+
26+
# no support for .*
27+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.}
28+
29+
for DOMAIN in $VIRTUAL_HOST_LIST; do
30+
echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
31+
done
2132
fi

‎docker/base-app/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,16 @@ fi
1717

1818
# Add own VIRTUAL_HOST as loopback
1919
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
20-
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
20+
# split comma by space
21+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'}
22+
23+
# replace *.domain for dns specific .domain wildcard
24+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.}
25+
26+
# no support for .*
27+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.}
28+
29+
for DOMAIN in $VIRTUAL_HOST_LIST; do
30+
echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
31+
done
2132
fi

‎docker/base-app/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,16 @@ fi
1717

1818
# Add own VIRTUAL_HOST as loopback
1919
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
20-
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
20+
# split comma by space
21+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'}
22+
23+
# replace *.domain for dns specific .domain wildcard
24+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.}
25+
26+
# no support for .*
27+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.}
28+
29+
for DOMAIN in $VIRTUAL_HOST_LIST; do
30+
echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
31+
done
2132
fi

‎docker/base-app/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,16 @@ fi
1717

1818
# Add own VIRTUAL_HOST as loopback
1919
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
20-
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
20+
# split comma by space
21+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'}
22+
23+
# replace *.domain for dns specific .domain wildcard
24+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.}
25+
26+
# no support for .*
27+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.}
28+
29+
for DOMAIN in $VIRTUAL_HOST_LIST; do
30+
echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
31+
done
2132
fi

‎docker/base-app/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,16 @@ fi
1717

1818
# Add own VIRTUAL_HOST as loopback
1919
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
20-
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
20+
# split comma by space
21+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'}
22+
23+
# replace *.domain for dns specific .domain wildcard
24+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.}
25+
26+
# no support for .*
27+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.}
28+
29+
for DOMAIN in $VIRTUAL_HOST_LIST; do
30+
echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
31+
done
2132
fi

‎docker/base-app/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,16 @@ fi
1717

1818
# Add own VIRTUAL_HOST as loopback
1919
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
20-
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
20+
# split comma by space
21+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'}
22+
23+
# replace *.domain for dns specific .domain wildcard
24+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.}
25+
26+
# no support for .*
27+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.}
28+
29+
for DOMAIN in $VIRTUAL_HOST_LIST; do
30+
echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
31+
done
2132
fi

‎docker/base-app/ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,16 @@ fi
1717

1818
# Add own VIRTUAL_HOST as loopback
1919
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
20-
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
20+
# split comma by space
21+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'}
22+
23+
# replace *.domain for dns specific .domain wildcard
24+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.}
25+
26+
# no support for .*
27+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.}
28+
29+
for DOMAIN in $VIRTUAL_HOST_LIST; do
30+
echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
31+
done
2132
fi

‎docker/base-app/ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,16 @@ fi
1717

1818
# Add own VIRTUAL_HOST as loopback
1919
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
20-
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
20+
# split comma by space
21+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'}
22+
23+
# replace *.domain for dns specific .domain wildcard
24+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.}
25+
26+
# no support for .*
27+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.}
28+
29+
for DOMAIN in $VIRTUAL_HOST_LIST; do
30+
echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
31+
done
2132
fi

‎docker/base-app/ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,16 @@ fi
1717

1818
# Add own VIRTUAL_HOST as loopback
1919
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
20-
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
20+
# split comma by space
21+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'}
22+
23+
# replace *.domain for dns specific .domain wildcard
24+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.}
25+
26+
# no support for .*
27+
VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.}
28+
29+
for DOMAIN in $VIRTUAL_HOST_LIST; do
30+
echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
31+
done
2132
fi

0 commit comments

Comments
 (0)