Merge remote-tracking branch 'upstream/master' into fix_config_require

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/ng/map.jinja

@@ -9,6 +9,7 @@
         'Debian': {
             'package': 'nginx',
             'passenger_package': 'passenger',
+            'passenger_config_file': '/etc/nginx/conf.d/passenger.conf',
             'service': 'nginx',
             'webuser': 'www-data',
             'conf_file': '/etc/nginx/nginx.conf',
@@ -21,6 +22,7 @@
         'CentOS': {
             'package': 'nginx',
             'passenger_package': 'passenger',
+            'passenger_config_file': '/etc/nginx/conf.d/passenger.conf',
             'service': 'nginx',
             'webuser': 'nginx',
             'conf_file': '/etc/nginx/nginx.conf',
@@ -36,6 +38,7 @@
         'RedHat': {
             'package': 'nginx',
             'passenger_package': 'passenger',
+            'passenger_config_file': '/etc/nginx/conf.d/passenger.conf',
             'service': 'nginx',
             'webuser': 'nginx',
             'conf_file': '/etc/nginx/nginx.conf',

nginx/ng/passenger.sls

@@ -26,7 +26,7 @@ passenger_install:
 passenger_config:
   file.managed:
     {{ sls_block(nginx.server.opts) }}
-    - name: /etc/nginx/conf.d/passenger.conf
+    - name: {{ nginx.lookup.passenger_config_file }}
     - source: salt://nginx/ng/files/nginx.conf
     - template: jinja
     - context:

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 -%}

pillar.example

@@ -51,6 +51,10 @@ nginx:
       server_available: /etc/nginx/sites-available
       server_enabled: /etc/nginx/sites-enabled
       server_use_symlink: True
+      # If you install nginx+passenger from phusionpassenger in Debian, these values will probably be needed
+      passenger_package: libnginx-mod-http-passenger
+      passenger_config_file: /etc/nginx/conf.d/mod-http-passenger.conf
+
       # This is required for RedHat like distros (Amazon Linux) that don't follow semantic versioning for $releasever
       rh_os_releasever: '6'
       # Currently it can be used on rhel/centos/suse when installing from repo