update htpasswd code

davidfm · Jul 8, 2017 · d50962a · d50962a
1 parent 298066f
commit d50962a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ansible/roles/services/apache/tasks/site_config.yml b/ansible/roles/services/apache/tasks/site_config.yml
@@ -9,7 +9,7 @@
 
 - name: Manage htpasswd users
   htpasswd:
-    path: "/opt/dockerapps/{{ instance_name }}/htpasswd/.htpasswd_{{ site.subdomain }}"
+    path: "/opt/dockerapps/{{ instance_name }}/.htpasswd/htpasswd_{{ site.subdomain }}"
     name: "{{ user.username }}"
     password: "{{ user.password }}"
   with_items: "{{ site.htpasswd_users | default ([]) }}"

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,4 @@ 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
diff --git a/ansible/roles/services/apache/templates/sites-enabled.conf.j2 b/ansible/roles/services/apache/templates/sites-enabled.conf.j2
@@ -18,7 +18,7 @@
 	    AuthType Basic
 	    AuthName {{ site.subdomain }}
 {% if "htpasswd" == site.auth %}
-            AuthUserFile htpasswd/.htpasswd_{{ site.subdomain }}
+            AuthUserFile .htpasswd/htpasswd_{{ site.subdomain }}
 {% endif %}
 	    Require valid-user
     </Location>