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

---
 php/adodb.sls     | 3 +--
 php/apc.sls       | 3 +--
 php/cgi.sls       | 3 +--
 php/cli.sls       | 3 +--
 php/curl.sls      | 3 +--
 php/dev.sls       | 3 +--
 php/fpm.sls       | 6 ++----
 php/gd.sls        | 3 +--
 php/imagick.sls   | 3 +--
 php/imap.sls      | 3 +--
 php/init.sls      | 3 +--
 php/intl.sls      | 3 +--
 php/json.sls      | 3 +--
 php/ldap.sls      | 3 +--
 php/mbstring.sls  | 3 +--
 php/mcrypt.sls    | 3 +--
 php/memcache.sls  | 3 +--
 php/memcached.sls | 3 +--
 php/mysql.sls     | 3 +--
 php/mysqlnd.sls   | 3 +--
 php/pear.sls      | 3 +--
 php/pgsql.sls     | 3 +--
 php/soap.sls      | 3 +--
 php/suhosin.sls   | 3 +--
 php/xml.sls       | 3 +--
 25 files changed, 26 insertions(+), 52 deletions(-)

diff --git a/php/adodb.sls b/php/adodb.sls
index 77cf980..7732f54 100644
--- a/php/adodb.sls
+++ b/php/adodb.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-adodb:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.adodb_pkg }}
diff --git a/php/apc.sls b/php/apc.sls
index 09b2246..c707f57 100644
--- a/php/apc.sls
+++ b/php/apc.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-apc:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.apc_pkg }}
diff --git a/php/cgi.sls b/php/cgi.sls
index b49ec8f..0fd2f38 100644
--- a/php/cgi.sls
+++ b/php/cgi.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-cgi:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.cgi_pkg }}
diff --git a/php/cli.sls b/php/cli.sls
index dab4ed3..2e739ca 100644
--- a/php/cli.sls
+++ b/php/cli.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-cli:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.cli_pkg }}
diff --git a/php/curl.sls b/php/curl.sls
index f795c2d..3cf6c43 100644
--- a/php/curl.sls
+++ b/php/curl.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-curl:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.curl_pkg }}
diff --git a/php/dev.sls b/php/dev.sls
index d9fe114..34729f3 100644
--- a/php/dev.sls
+++ b/php/dev.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-dev:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.dev_pkg }}
diff --git a/php/fpm.sls b/php/fpm.sls
index 3b91f6e..4ff2b14 100644
--- a/php/fpm.sls
+++ b/php/fpm.sls
@@ -1,10 +1,8 @@
 {% from "php/map.jinja" import php with context %}
 
 php-fpm:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.fpm_pkg }}
-  service:
-    - running
+  service.running:
     - name: {{ php.fpm_service }}
     - enable: True
diff --git a/php/gd.sls b/php/gd.sls
index f2b62dc..8ce4576 100644
--- a/php/gd.sls
+++ b/php/gd.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-gd:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.gd_pkg }}
diff --git a/php/imagick.sls b/php/imagick.sls
index 2274574..8673ba8 100644
--- a/php/imagick.sls
+++ b/php/imagick.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-imagick:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.imagick_pkg }}
diff --git a/php/imap.sls b/php/imap.sls
index e7483e3..e6708fe 100644
--- a/php/imap.sls
+++ b/php/imap.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-imap:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.imap_pkg }}
diff --git a/php/init.sls b/php/init.sls
index 0bbd097..1192bce 100644
--- a/php/init.sls
+++ b/php/init.sls
@@ -16,6 +16,5 @@ php54:
 {% endif %}
 
 php:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.php_pkg }}
diff --git a/php/intl.sls b/php/intl.sls
index 683562e..7439f23 100644
--- a/php/intl.sls
+++ b/php/intl.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-intl:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.intl_pkg }}
diff --git a/php/json.sls b/php/json.sls
index 2d80a2f..a3e99db 100644
--- a/php/json.sls
+++ b/php/json.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-json:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.json_pkg }}
diff --git a/php/ldap.sls b/php/ldap.sls
index b2e889c..da7c88e 100644
--- a/php/ldap.sls
+++ b/php/ldap.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-ldap:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.ldap_pkg }}
diff --git a/php/mbstring.sls b/php/mbstring.sls
index dbe75a6..1a401e8 100644
--- a/php/mbstring.sls
+++ b/php/mbstring.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-mbstring:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.mbstring_pkg }}
diff --git a/php/mcrypt.sls b/php/mcrypt.sls
index 40d31d0..3b16f34 100644
--- a/php/mcrypt.sls
+++ b/php/mcrypt.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-mcrypt:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.mcrypt_pkg }}
diff --git a/php/memcache.sls b/php/memcache.sls
index a6b03c6..af8d776 100644
--- a/php/memcache.sls
+++ b/php/memcache.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-memcache:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.memcache_pkg }}
diff --git a/php/memcached.sls b/php/memcached.sls
index bb1ac38..ca040fb 100644
--- a/php/memcached.sls
+++ b/php/memcached.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-memcached:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.memcached_pkg }}
diff --git a/php/mysql.sls b/php/mysql.sls
index 09c1cee..170347d 100644
--- a/php/mysql.sls
+++ b/php/mysql.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-mysql:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.mysql_pkg }}
diff --git a/php/mysqlnd.sls b/php/mysqlnd.sls
index 2dda9f3..354d55c 100644
--- a/php/mysqlnd.sls
+++ b/php/mysqlnd.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-mysqlnd:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.mysqlnd_pkg }}
diff --git a/php/pear.sls b/php/pear.sls
index 3968a9b..d39e2c5 100644
--- a/php/pear.sls
+++ b/php/pear.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-pear:
-  pkg:
-    - installed
+  pkg.installed:
     - name : {{ php.pear_pkg }}
diff --git a/php/pgsql.sls b/php/pgsql.sls
index bfed436..119e968 100644
--- a/php/pgsql.sls
+++ b/php/pgsql.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-pgsql:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.pgsql_pkg }}
diff --git a/php/soap.sls b/php/soap.sls
index 18cad70..4ff190e 100644
--- a/php/soap.sls
+++ b/php/soap.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-soap:
-  pkg:
-    - installed
+  pkg.installed:
     - name : {{ php.soap_pkg }}
diff --git a/php/suhosin.sls b/php/suhosin.sls
index 1045afa..e57d1e4 100644
--- a/php/suhosin.sls
+++ b/php/suhosin.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-suhosin:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.suhosin_pkg }}
diff --git a/php/xml.sls b/php/xml.sls
index 9c63a00..c9057cf 100644
--- a/php/xml.sls
+++ b/php/xml.sls
@@ -1,6 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
 php-xml:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ php.xml_pkg }}