Skip to content

Commit fd972dc

Browse files
mblaschkemblaschke
committed
Merge branch 'release/0.56.0'
2 parents 206b3e1 + 96a961b commit fd972dc

File tree

254 files changed

+873
-201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

254 files changed

+873
-201
lines changed

‎CHANGELOG.md

+6

‎README.md

+1-1

‎docker/ansible/alpine-3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0

‎docker/ansible/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0

‎docker/ansible/debian-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0

‎docker/ansible/debian-8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0

‎docker/ansible/debian-9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0

‎docker/ansible/ubuntu-12.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0

‎docker/ansible/ubuntu-14.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0

‎docker/ansible/ubuntu-15.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0

‎docker/ansible/ubuntu-15.10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0

‎docker/ansible/ubuntu-16.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0

‎docker/apache-dev/alpine-3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:alpine-3
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:centos-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/debian-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:debian-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/debian-8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:debian-8
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/debian-9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:debian-9
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/ubuntu-12.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-12.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/ubuntu-14.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-14.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/ubuntu-15.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/ubuntu-15.10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.10
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/ubuntu-16.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-16.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/alpine-3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/debian-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/debian-8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/debian-9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-12.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-14.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-15.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-15.10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-16.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/base-app/alpine-3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV APPLICATION_USER application
1414
ENV APPLICATION_GROUP application

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

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## clear dns file
2-
echo > /etc/dnsmasq.d/development
2+
echo > /etc/dnsmasq.d/webdevops
33

44
if [ ! -f /etc/resolv.conf.original ]; then
55
cp -a /etc/resolv.conf /etc/resolv.conf.original
@@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
1010
## set dnsmasq to main nameserver
1111
echo "nameserver 127.0.0.1" > /etc/resolv.conf
1212
fi
13+
14+
# Add own VIRTUAL_HOST as loopback
15+
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
16+
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
17+
fi

‎docker/base-app/alpine-3/conf/etc/supervisor.d/dnsmasq.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ priority=15
66
command = /opt/docker/bin/service.d/dnsmasq.sh
77
process_name=%(program_name)s
88
startsecs = 0
9-
autostart = false
9+
autostart = true
1010
autorestart = true
1111
stdout_logfile=/dev/stdout
1212
stdout_logfile_maxbytes=0

‎docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
- include: bootstrap/dnsmasq.yml
66
- include: bootstrap/postfix.yml
77
- include: bootstrap/ssh.yml
8+
- include: bootstrap/geoip.yml

‎docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/geoip.yml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
3+
- name: Maxmind directory
4+
file:
5+
path: /usr/share/GeoIP/
6+
mode: 0755
7+
owner: root
8+
state: directory
9+
10+
- name: Fetch Maxmind db
11+
get_url:
12+
url: '{{ item.url }}'
13+
dest: '/usr/share/GeoIP/{{ item.dest }}'
14+
mode: 0444
15+
with_items:
16+
# GeoLite
17+
- { url: 'https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz', dest: 'GeoLite2-City.mmdb.gz' }
18+
- { url: 'https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz', dest: 'GeoLite2-Country.mmdb.gz' }
19+
# Legacy
20+
- { url: 'https://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz', dest: 'GeoIP.dat.gz' }
21+
- { url: 'https://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz', dest: 'GeoIPv6.dat.gz' }
22+
- { url: 'https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz', dest: 'GeoLiteCity.dat.gz' }
23+
- { url: 'https://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz', dest: 'GeoLiteCityv6.dat.gz' }
24+
- { url: 'https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz', dest: 'GeoIPASNum.dat.gz' }
25+
- { url: 'https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz', dest: 'GeoIPASNumv6.dat.gz' }
26+
27+
- name: Extract Maxmind db
28+
command: gunzip -f /usr/share/GeoIP/{{ item }}.gz
29+
with_items:
30+
# GeoLite
31+
- GeoLite2-City.mmdb
32+
- GeoLite2-Country.mmdb
33+
# Legacy
34+
- GeoIP.dat
35+
- GeoIPv6.dat
36+
- GeoLiteCity.dat
37+
- GeoLiteCityv6.dat
38+
- GeoIPASNum.dat
39+
- GeoIPASNumv6.dat

‎docker/base-app/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.55.3
11+
LABEL io.webdevops.version=0.56.0
1212

1313
ENV APPLICATION_USER application
1414
ENV APPLICATION_GROUP application

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

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## clear dns file
2-
echo > /etc/dnsmasq.d/development
2+
echo > /etc/dnsmasq.d/webdevops
33

44
if [ ! -f /etc/resolv.conf.original ]; then
55
cp -a /etc/resolv.conf /etc/resolv.conf.original
@@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
1010
## set dnsmasq to main nameserver
1111
echo "nameserver 127.0.0.1" > /etc/resolv.conf
1212
fi
13+
14+
# Add own VIRTUAL_HOST as loopback
15+
if [[ -n "${VIRTUAL_HOST+x}" ]]; then
16+
echo "address=/${VIRTUAL_HOST}/127.0.0.1" >> /etc/dnsmasq.d/webdevops
17+
fi

‎docker/base-app/centos-7/conf/etc/supervisor.d/dnsmasq.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ priority=15
66
command = /opt/docker/bin/service.d/dnsmasq.sh
77
process_name=%(program_name)s
88
startsecs = 0
9-
autostart = false
9+
autostart = true
1010
autorestart = true
1111
stdout_logfile=/dev/stdout
1212
stdout_logfile_maxbytes=0

‎docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
- include: bootstrap/dnsmasq.yml
66
- include: bootstrap/postfix.yml
77
- include: bootstrap/ssh.yml
8+
- include: bootstrap/geoip.yml

0 commit comments

Comments
 (0)