From 774f20b3bfd623fb1c2241f914f6cf86051f6a1e Mon Sep 17 00:00:00 2001
From: Kenshir0 <kenshiro@chouboutouk.org>
Date: Thu, 27 Nov 2014 23:38:31 +0100
Subject: [PATCH] Use makedirs for server_cache_dir and server_log_dir

---
 apt-cacher/ng/server.sls | 2 ++
 pillar.example           | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apt-cacher/ng/server.sls b/apt-cacher/ng/server.sls
index 685a4a4..3f77245 100644
--- a/apt-cacher/ng/server.sls
+++ b/apt-cacher/ng/server.sls
@@ -28,6 +28,7 @@ apt-cacher-ng:
 {{ apt_cacher_ng.server_cache_dir }}:
   file:
     - directory
+    - makedirs: True
     - user: {{ apt_cacher_ng.user }}
     - group: {{ apt_cacher_ng.group }}
     - mode: '2755'
@@ -35,6 +36,7 @@ apt-cacher-ng:
 {{ apt_cacher_ng.server_log_dir }}:
   file:
     - directory
+    - makedirs: True
     - user: {{ apt_cacher_ng.user }}
     - group: {{ apt_cacher_ng.group }}
     - mode: '2755'
diff --git a/pillar.example b/pillar.example
index 51e55b6..fc25e3e 100644
--- a/pillar.example
+++ b/pillar.example
@@ -14,8 +14,8 @@ apt_cacher_ng:
   server_bind_address: 192.168.33.10
 
   server_port: 3142
-  cache_dir: /var/cache/apt-cacher-ng
-  log_dir: /var/log/apt-cacher-ng
+  server_cache_dir: /var/cache/apt-cacher-ng
+  server_log_dir: /var/log/apt-cacher-ng
 
   # Credentials for apt-cacher-ng Web management interface.
   # http://<server_adress>:<server_port>/acng-report.html