From c5c10478650a6bbc8b91573544babd7e66b97f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= <javier@netmanagers.com.ar>
Date: Tue, 13 Feb 2018 21:27:15 -0300
Subject: [PATCH] Allow to specify a different passenger config file in
 nginx.ng

---
 nginx/ng/map.jinja     | 3 +++
 nginx/ng/passenger.sls | 2 +-
 pillar.example         | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/nginx/ng/map.jinja b/nginx/ng/map.jinja
index c166877..c5bb973 100644
--- a/nginx/ng/map.jinja
+++ b/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',
diff --git a/nginx/ng/passenger.sls b/nginx/ng/passenger.sls
index 6b03430..220056b 100644
--- a/nginx/ng/passenger.sls
+++ b/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:
diff --git a/pillar.example b/pillar.example
index b728869..a91ad14 100644
--- a/pillar.example
+++ b/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