Force Apache to use bridge network

davidfm · Jul 8, 2017 · 3abfdec · 3abfdec
1 parent 63bd95e
commit 3abfdec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ansible/roles/services/apache/templates/docker-compose.yml.j2 b/ansible/roles/services/apache/templates/docker-compose.yml.j2
@@ -11,4 +11,5 @@ services:
       - /opt/dockerapps/{{ instance_name }}/httpd.conf:/usr/local/apache2/conf/httpd.conf:ro,z
       - /opt/dockerapps/{{ instance_name }}/sites-enabled/:/usr/local/apache2/conf/sites-enabled/:ro,z
       - /opt/dockerapps/{{ instance_name }}/letsencrypt/:/etc/letsencrypt/:ro,z
-      - /opt/dockerapps/{{ instance_name }}/.htpasswd/:/usr/local/apache2/htpasswd/:ro,z
+      - /opt/dockerapps/{{ instance_name }}/.htpasswd/:/usr/local/apache2/.htpasswd/:ro,z
+    network_mode: bridge
diff --git a/ansible/roles/services/apache/templates/sites-enabled.conf.j2 b/ansible/roles/services/apache/templates/sites-enabled.conf.j2
@@ -1,6 +1,6 @@
 ##############MANAGED BY ANSIBLE, DO NOT CHANGE##############
 <VirtualHost *:443>
-    ServerName {{ site.subdomain }}.{{ domain_name }}
+    ServerName {{ site.subdomain }}.{{ domain }}
     ProxyRequests Off
     ProxyPreserveHost On
     SSLEngine On