From dabbc99cc1ac8c73866f4a4f18e1db3b92b997f7 Mon Sep 17 00:00:00 2001
From: Andres Montalban <amontalban@devopx.com>
Date: Tue, 26 Dec 2017 19:37:01 -0300
Subject: [PATCH] Servers config should require available/enabled dirs

---
 nginx/ng/map.jinja          | 4 +++-
 nginx/ng/servers_config.sls | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nginx/ng/map.jinja b/nginx/ng/map.jinja
index c166877..a34eeb1 100644
--- a/nginx/ng/map.jinja
+++ b/nginx/ng/map.jinja
@@ -145,7 +145,9 @@
         'disabled_postfix': '.disabled',
         'symlink_opts': {},
         'rename_opts': {},
-        'managed_opts': {},
+        'managed_opts': {
+            'makedirs': True,
+            },
         'dir_opts': {
             'makedirs': True,
         },
diff --git a/nginx/ng/servers_config.sls b/nginx/ng/servers_config.sls
index 8faddb9..b5cd9e0 100644
--- a/nginx/ng/servers_config.sls
+++ b/nginx/ng/servers_config.sls
@@ -112,6 +112,8 @@ nginx_server_available_dir:
     - name: {{ server_curpath(server) }}
     - source: {{ source_path }}
     - template: jinja
+    - require_in:
+      - service: nginx_service
 {% if 'source_path' not in settings.config %}
     - context:
         config: {{ settings.config|json() }}