Changed php5 calls to more generic php

php/curl.sls

@@ -3,8 +3,9 @@ include:
 
 {% if grains['os']=="Ubuntu" %}
 
-php5-curl:
+php-curl:
   pkg.installed:
+    - name: php5-curl
     - order: 180
 
 {% endif %}

php/fpm.sls

@@ -3,10 +3,12 @@ include:
 
 {% if grains['os']=="Ubuntu" %}
 
-php5-fpm:
+php-fpm:
   pkg.installed:
+    - name: php5-fpm
     - order: 175
   service.running:
+    - name: php5-fpm
     - enable: True
     - order: 455
 

php/gd.sls

@@ -3,8 +3,9 @@ include:
 
 {% if grains['os']=="Ubuntu" %}
 
-php5-gd:
+php-gd:
   pkg.installed:
+    - name: php5-gd
     - order: 180
 
 {% endif %}

php/init.sls

@@ -3,8 +3,9 @@ include:
 
 {% if grains['os']=="Ubuntu" %}
 
-php5:
+php:
   pkg.installed:
+    - name: php5
     - order: 175
 
 {% endif %}

php/mcrypt.sls

@@ -3,8 +3,9 @@ include:
 
 {% if grains['os']=="Ubuntu" %}
 
-php5-mcrypt:
+php-mcrypt:
   pkg.installed:
+    - name: php5-mcrypt
     - order: 180
 
 {% endif %}

php/mysql.sls

@@ -3,8 +3,9 @@ include:
 
 {% if grains['os']=="Ubuntu" %}
 
-php5-mysql:
+php-mysql:
   pkg.installed:
+    - name: php5-mysql
     - order: 180
 
 {% endif %}