From cf55e1324437434dc41eca9e432ba540073d072c Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Wed, 7 Feb 2018 15:49:10 -0500
Subject: [PATCH] common salt module - fix file name and add direcltry

---
 salt/common/init.sls                                     | 9 ++++++++-
 .../nginx/{nginx.conf.master => nginx.conf.so-master}    | 0
 2 files changed, 8 insertions(+), 1 deletion(-)
 rename salt/common/nginx/{nginx.conf.master => nginx.conf.so-master} (100%)

diff --git a/salt/common/init.sls b/salt/common/init.sls
index ab6babfd9..be119a651 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -44,13 +44,20 @@ toosmooth/so-core:test2:
 
 # Drop the correct nginx config based on role
 
+nginxconfdir:
+  file.directory:
+    - name: /opt/so/conf/nginx
+    - user: 939
+    - group: 939
+    - makedirs: True
+
 nginxconf:
   file.managed:
     - name: /opt/so/conf/nginx/nginx.conf
     - user: 939
     - group: 939
     - template: jinja
-    - source: salt://conf/nginx/nginx.conf.{{ grains.role }}
+    - source: salt://common/nginx/nginx.conf.{{ grains.role }}
 
 # Start the core docker
 so-core:
diff --git a/salt/common/nginx/nginx.conf.master b/salt/common/nginx/nginx.conf.so-master
similarity index 100%
rename from salt/common/nginx/nginx.conf.master
rename to salt/common/nginx/nginx.conf.so-master