From 7309a56ed2fe39a6edd9369fd8090a3deb06a375 Mon Sep 17 00:00:00 2001 From: Alan McNea Date: Mon, 29 Jul 2013 22:27:43 +0000 Subject: [PATCH] Changed php5 calls to more generic php --- php/curl.sls | 3 ++- php/fpm.sls | 4 +++- php/gd.sls | 3 ++- php/init.sls | 3 ++- php/mcrypt.sls | 3 ++- php/mysql.sls | 3 ++- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/php/curl.sls b/php/curl.sls index 3193fcf..8495dfb 100644 --- a/php/curl.sls +++ b/php/curl.sls @@ -3,8 +3,9 @@ include: {% if grains['os']=="Ubuntu" %} -php5-curl: +php-curl: pkg.installed: + - name: php5-curl - order: 180 {% endif %} diff --git a/php/fpm.sls b/php/fpm.sls index 27a2aa3..efc71f0 100644 --- a/php/fpm.sls +++ b/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 diff --git a/php/gd.sls b/php/gd.sls index a5b5885..b8eff90 100644 --- a/php/gd.sls +++ b/php/gd.sls @@ -3,8 +3,9 @@ include: {% if grains['os']=="Ubuntu" %} -php5-gd: +php-gd: pkg.installed: + - name: php5-gd - order: 180 {% endif %} diff --git a/php/init.sls b/php/init.sls index e8b5a27..c718554 100644 --- a/php/init.sls +++ b/php/init.sls @@ -3,8 +3,9 @@ include: {% if grains['os']=="Ubuntu" %} -php5: +php: pkg.installed: + - name: php5 - order: 175 {% endif %} diff --git a/php/mcrypt.sls b/php/mcrypt.sls index 7339b18..fc19d99 100644 --- a/php/mcrypt.sls +++ b/php/mcrypt.sls @@ -3,8 +3,9 @@ include: {% if grains['os']=="Ubuntu" %} -php5-mcrypt: +php-mcrypt: pkg.installed: + - name: php5-mcrypt - order: 180 {% endif %} diff --git a/php/mysql.sls b/php/mysql.sls index 393488c..a9563e7 100644 --- a/php/mysql.sls +++ b/php/mysql.sls @@ -3,8 +3,9 @@ include: {% if grains['os']=="Ubuntu" %} -php5-mysql: +php-mysql: pkg.installed: + - name: php5-mysql - order: 180 {% endif %}