From 7f2436b71204b90acc64d884bbb14a3462894ae7 Mon Sep 17 00:00:00 2001
From: Seth House <seth@eseth.com>
Date: Sat, 13 Dec 2014 00:19:58 -0700
Subject: [PATCH] Change states to use short-dec style

---
 apt-cacher/ng/server.sls | 18 ++++++------------
 apt-cacher/server.sls    |  3 +--
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/apt-cacher/ng/server.sls b/apt-cacher/ng/server.sls
index 3f77245..9a1ffc4 100644
--- a/apt-cacher/ng/server.sls
+++ b/apt-cacher/ng/server.sls
@@ -2,11 +2,9 @@
 {% from "apt-cacher/ng/map.jinja" import apt_cacher_ng with context %}
 
 apt-cacher-ng:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ apt_cacher_ng.pkg }}
-  service:
-    - running
+  service.running:
     - name: {{ apt_cacher_ng.service }}
     - enable: True
     - watch:
@@ -17,8 +15,7 @@ apt-cacher-ng:
       - file: {{ apt_cacher_ng.server_log_dir }}
 
 {{ apt_cacher_ng.server_config }}:
-  file:
-    - managed
+  file.managed:
     - user: root
     - group: root
     - mode: '644'
@@ -26,24 +23,21 @@ apt-cacher-ng:
     - template: jinja
 
 {{ apt_cacher_ng.server_cache_dir }}:
-  file:
-    - directory
+  file.directory:
     - makedirs: True
     - user: {{ apt_cacher_ng.user }}
     - group: {{ apt_cacher_ng.group }}
     - mode: '2755'
 
 {{ apt_cacher_ng.server_log_dir }}:
-  file:
-    - directory
+  file.directory:
     - makedirs: True
     - user: {{ apt_cacher_ng.user }}
     - group: {{ apt_cacher_ng.group }}
     - mode: '2755'
 
 {{ apt_cacher_ng.credentials }}:
-  file:
-    - managed
+  file.managed:
     - user: {{ apt_cacher_ng.user }}
     - group: {{ apt_cacher_ng.group }}
     - mode: '600'
diff --git a/apt-cacher/server.sls b/apt-cacher/server.sls
index bc1376f..ace15d9 100644
--- a/apt-cacher/server.sls
+++ b/apt-cacher/server.sls
@@ -2,8 +2,7 @@ include:
   - apache
 
 apt-cacher:
-  pkg:
-    - installed
+  pkg.installed: []
   service.running:
     - enable: True
     - require: