Merge branch 'master' into test-harness

README.rst

@@ -83,6 +83,11 @@ Installs nginx from package, from the distribution repositories, the official ng
 
 Builds and installs nginx from source.
 
+``nginx.ng.certificates``
+-------------------
+
+Manages the deployment of nginx certificates.
+
 ``nginx.ng.config``
 -------------------
 

nginx/users.sls

@@ -5,9 +5,14 @@ htpasswd:
   pkg.installed:
     - name: {{ nginx.apache_utils }}
 
+touch {{ htauth }}:
+  cmd.run:
+    - creates: {{ htauth }}
+
 make sure {{ htauth }} exists:
-  file.exists:
+  file.managed:
     - name: {{ htauth }}
+    - makedirs: True
 
 {% for name, user in pillar.get('users', {}).items() %}
 {% if user['webauth'] is defined -%}