From ea5ee43cc6a6f7a29921bb1e57c88347d856cb00 Mon Sep 17 00:00:00 2001 From: Forrest Alvarez Date: Wed, 27 Nov 2013 05:55:10 +0000 Subject: [PATCH 01/11] First rework of php formula to bring it up to standards. --- php/apc.sls | 11 +++++------ php/curl.sls | 12 +++++------- php/fpm.sls | 18 ++++++++---------- php/gd.sls | 12 +++++------- php/init.sls | 12 +++++------- php/map.jinja | 24 ++++++++++++++++++++++++ php/mcrypt.sls | 12 +++++------- php/mysql.sls | 12 +++++------- php/pear.sls | 11 +++++------ 9 files changed, 67 insertions(+), 57 deletions(-) create mode 100644 php/map.jinja diff --git a/php/apc.sls b/php/apc.sls index 6241fad..4f18f47 100644 --- a/php/apc.sls +++ b/php/apc.sls @@ -1,10 +1,9 @@ +{% from "php/map.jinja" import php with context %} + include: - apt -{% if grains['os']=="Ubuntu" %} - php-apc: - pkg.installed: - - order: 180 - -{% endif %} + pkg: + - installed + - name: {{ php.apc-pkg }} diff --git a/php/curl.sls b/php/curl.sls index 8495dfb..732539e 100644 --- a/php/curl.sls +++ b/php/curl.sls @@ -1,11 +1,9 @@ +{% from "php/map.jinja" import php with context %} + include: - apt -{% if grains['os']=="Ubuntu" %} - php-curl: - pkg.installed: - - name: php5-curl - - order: 180 - -{% endif %} + pkg + - installed + - name: {{ curl-pkg }} diff --git a/php/fpm.sls b/php/fpm.sls index efc71f0..4d09c96 100644 --- a/php/fpm.sls +++ b/php/fpm.sls @@ -1,15 +1,13 @@ +{{% from "php/map.jinja" import php with context %} + include: - apt -{% if grains['os']=="Ubuntu" %} - php-fpm: - pkg.installed: - - name: php5-fpm - - order: 175 - service.running: - - name: php5-fpm + pkg: + - installed + - name: {{ fpm-pkg }} + service: + - running + - name: {{ fpm-service }} - enable: True - - order: 455 - -{% endif %} diff --git a/php/gd.sls b/php/gd.sls index b8eff90..f1536ec 100644 --- a/php/gd.sls +++ b/php/gd.sls @@ -1,11 +1,9 @@ +{{% from "php/map.jinja" import php with context %} + include: - apt -{% if grains['os']=="Ubuntu" %} - php-gd: - pkg.installed: - - name: php5-gd - - order: 180 - -{% endif %} + pkg: + - installed + - name: {{ gd-pkg }} diff --git a/php/init.sls b/php/init.sls index c718554..53dfa5f 100644 --- a/php/init.sls +++ b/php/init.sls @@ -1,11 +1,9 @@ +{% from "php/map.jinja import php with context %} + include: - apt -{% if grains['os']=="Ubuntu" %} - php: - pkg.installed: - - name: php5 - - order: 175 - -{% endif %} + pkg: + - installed + - name: {{ php-pkg }} diff --git a/php/map.jinja b/php/map.jinja new file mode 100644 index 0000000..68a1aca --- /dev/null +++ b/php/map.jinja @@ -0,0 +1,24 @@ +{% set map = salt['grains.filter_by']({ + 'Ubuntu': { + 'php-pkg': 'php5', + 'apc-pkg': 'php-apc', + 'curl-pkg': 'php-curl', + 'fpm-pkg': 'php5-fpm', + 'gd-pkg': 'php5-gd', + 'mcrypt-pkg': 'php5-mcrypt', + 'mysql-pkg': 'php5-mysql', + 'pear-pkg': ' php-pear', + 'fpm-service': 'php5-fpm', + }, + 'RedHat': { + 'php-pkg': 'php5', + 'apc-pkg': 'php-apc', + 'curl-pkg': 'php-curl', + 'fpm-pkg': 'php5-fpm', + 'gd-pkg': 'php5-gd', + 'mcrypt-pkg': 'php5-mcrypt', + 'mysql-pkg': 'php5-mysql', + 'pear-pkg': ' php-pear', + 'fpm-service': 'php5-fpm', + }, +}, merge=salt['pillar.get']('php:lookup')) $} diff --git a/php/mcrypt.sls b/php/mcrypt.sls index fc19d99..e310486 100644 --- a/php/mcrypt.sls +++ b/php/mcrypt.sls @@ -1,11 +1,9 @@ +{% from "php/map.jinja" import php with context %} + include: - apt -{% if grains['os']=="Ubuntu" %} - php-mcrypt: - pkg.installed: - - name: php5-mcrypt - - order: 180 - -{% endif %} + pkg: + - installed + - name: {{ mcrpyt-pkg }} diff --git a/php/mysql.sls b/php/mysql.sls index a9563e7..610ba23 100644 --- a/php/mysql.sls +++ b/php/mysql.sls @@ -1,11 +1,9 @@ +{% from "php/map.jinja import php with context %} + include: - apt -{% if grains['os']=="Ubuntu" %} - php-mysql: - pkg.installed: - - name: php5-mysql - - order: 180 - -{% endif %} + pkg: + - installed + - name: {{ mysql-pkg }} diff --git a/php/pear.sls b/php/pear.sls index cb9b1b5..f8a0958 100644 --- a/php/pear.sls +++ b/php/pear.sls @@ -1,10 +1,9 @@ +{% from "php/map.jinja" import php with context %} + include: - apt -{% if grains['os']=="Ubuntu" %} - php-pear: - pkg.installed: - - order: 180 - -{% endif %} + pkg: + - installed + - name : {{ pear-pkg }} From 713ffba8899b4e603462eb5a0780dc8c77dac635 Mon Sep 17 00:00:00 2001 From: Forrest Alvarez Date: Thu, 2 Jan 2014 04:51:53 +0000 Subject: [PATCH 02/11] fixed some typos --- php/init.sls | 2 +- php/mysql.sls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php/init.sls b/php/init.sls index 53dfa5f..7cb2fc0 100644 --- a/php/init.sls +++ b/php/init.sls @@ -1,4 +1,4 @@ -{% from "php/map.jinja import php with context %} +{% from "php/map.jinja" import php with context %} include: - apt diff --git a/php/mysql.sls b/php/mysql.sls index 610ba23..4878fe1 100644 --- a/php/mysql.sls +++ b/php/mysql.sls @@ -1,4 +1,4 @@ -{% from "php/map.jinja import php with context %} +{% from "php/map.jinja" import php with context %} include: - apt From 97ab7e74056cdd7ab25fcc362185f61f4d0e2d25 Mon Sep 17 00:00:00 2001 From: Forrest Alvarez Date: Thu, 2 Jan 2014 04:55:36 +0000 Subject: [PATCH 03/11] Fixed some spots where I forgot to reference the map properly. --- php/curl.sls | 2 +- php/fpm.sls | 4 ++-- php/gd.sls | 2 +- php/init.sls | 2 +- php/mcrypt.sls | 2 +- php/mysql.sls | 2 +- php/pear.sls | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/php/curl.sls b/php/curl.sls index 732539e..a35358f 100644 --- a/php/curl.sls +++ b/php/curl.sls @@ -6,4 +6,4 @@ include: php-curl: pkg - installed - - name: {{ curl-pkg }} + - name: {{ php.curl-pkg }} diff --git a/php/fpm.sls b/php/fpm.sls index 4d09c96..a702380 100644 --- a/php/fpm.sls +++ b/php/fpm.sls @@ -6,8 +6,8 @@ include: php-fpm: pkg: - installed - - name: {{ fpm-pkg }} + - name: {{ php.fpm-pkg }} service: - running - - name: {{ fpm-service }} + - name: {{ php.fpm-service }} - enable: True diff --git a/php/gd.sls b/php/gd.sls index f1536ec..32c79a9 100644 --- a/php/gd.sls +++ b/php/gd.sls @@ -6,4 +6,4 @@ include: php-gd: pkg: - installed - - name: {{ gd-pkg }} + - name: {{ php.gd-pkg }} diff --git a/php/init.sls b/php/init.sls index 7cb2fc0..bd31f0e 100644 --- a/php/init.sls +++ b/php/init.sls @@ -6,4 +6,4 @@ include: php: pkg: - installed - - name: {{ php-pkg }} + - name: {{ php.php-pkg }} diff --git a/php/mcrypt.sls b/php/mcrypt.sls index e310486..47c39b7 100644 --- a/php/mcrypt.sls +++ b/php/mcrypt.sls @@ -6,4 +6,4 @@ include: php-mcrypt: pkg: - installed - - name: {{ mcrpyt-pkg }} + - name: {{ php.mcrpyt-pkg }} diff --git a/php/mysql.sls b/php/mysql.sls index 4878fe1..a2d961e 100644 --- a/php/mysql.sls +++ b/php/mysql.sls @@ -6,4 +6,4 @@ include: php-mysql: pkg: - installed - - name: {{ mysql-pkg }} + - name: {{ php.mysql-pkg }} diff --git a/php/pear.sls b/php/pear.sls index f8a0958..d6a95eb 100644 --- a/php/pear.sls +++ b/php/pear.sls @@ -6,4 +6,4 @@ include: php-pear: pkg: - installed - - name : {{ pear-pkg }} + - name : {{ php.pear-pkg }} From b9002cc3d5cdc7607d5dd816a10e70ec2b5ab7a3 Mon Sep 17 00:00:00 2001 From: Forrest Alvarez Date: Thu, 2 Jan 2014 05:01:12 +0000 Subject: [PATCH 04/11] Some more fixes for the OS name from testing. --- php/map.jinja | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php/map.jinja b/php/map.jinja index 68a1aca..d768bf8 100644 --- a/php/map.jinja +++ b/php/map.jinja @@ -1,5 +1,5 @@ -{% set map = salt['grains.filter_by']({ - 'Ubuntu': { +{% set php = salt['grains.filter_by']({ + 'Debian': { 'php-pkg': 'php5', 'apc-pkg': 'php-apc', 'curl-pkg': 'php-curl', From 17927738918025ddb96f9aa174d24e71c2567b6c Mon Sep 17 00:00:00 2001 From: Forrest Alvarez Date: Thu, 2 Jan 2014 05:02:15 +0000 Subject: [PATCH 05/11] Fixed an incorrect character which was messing things up in the map. --- php/map.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/map.jinja b/php/map.jinja index d768bf8..c39bfa4 100644 --- a/php/map.jinja +++ b/php/map.jinja @@ -21,4 +21,4 @@ 'pear-pkg': ' php-pear', 'fpm-service': 'php5-fpm', }, -}, merge=salt['pillar.get']('php:lookup')) $} +}, merge=salt['pillar.get']('php:lookup')) %} From b877441585983a44c94571ca7493775cb9d34f40 Mon Sep 17 00:00:00 2001 From: Forrest Alvarez Date: Thu, 2 Jan 2014 05:20:11 +0000 Subject: [PATCH 06/11] Fixed some name issues for the php packages between distros. --- php/map.jinja | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/php/map.jinja b/php/map.jinja index c39bfa4..8e178ab 100644 --- a/php/map.jinja +++ b/php/map.jinja @@ -1,24 +1,24 @@ {% set php = salt['grains.filter_by']({ 'Debian': { - 'php-pkg': 'php5', - 'apc-pkg': 'php-apc', - 'curl-pkg': 'php-curl', - 'fpm-pkg': 'php5-fpm', - 'gd-pkg': 'php5-gd', - 'mcrypt-pkg': 'php5-mcrypt', - 'mysql-pkg': 'php5-mysql', - 'pear-pkg': ' php-pear', - 'fpm-service': 'php5-fpm', + 'php_pkg': 'php5', + 'apc_pkg': 'php-apc', + 'curl_pkg': 'php5-curl', + 'fpm_pkg': 'php5-fpm', + 'gd_pkg': 'php5-gd', + 'mcrypt_pkg': 'php5-mcrypt', + 'mysql_pkg': 'php5-mysql', + 'pear_pkg': ' php-pear', + 'fpm_service': 'php5-fpm', }, 'RedHat': { - 'php-pkg': 'php5', - 'apc-pkg': 'php-apc', + 'php_pkg': 'php', + 'apc-pkg': 'php-pecl-apc', 'curl-pkg': 'php-curl', - 'fpm-pkg': 'php5-fpm', - 'gd-pkg': 'php5-gd', - 'mcrypt-pkg': 'php5-mcrypt', - 'mysql-pkg': 'php5-mysql', + 'fpm-pkg': 'php-fpm', + 'gd-pkg': 'php-gd', + 'mcrypt-pkg': 'php-mcrypt', + 'mysql-pkg': 'php-mysql', 'pear-pkg': ' php-pear', - 'fpm-service': 'php5-fpm', + 'fpm-service': 'php-fpm', }, }, merge=salt['pillar.get']('php:lookup')) %} From 17154c06d4224d0ce70f8036223a5e852ffb7b31 Mon Sep 17 00:00:00 2001 From: Forrest Alvarez Date: Thu, 2 Jan 2014 05:23:17 +0000 Subject: [PATCH 07/11] Fixed variable naming that was creating errors. --- php/apc.sls | 2 +- php/curl.sls | 2 +- php/fpm.sls | 4 ++-- php/gd.sls | 2 +- php/init.sls | 2 +- php/mcrypt.sls | 2 +- php/pear.sls | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/php/apc.sls b/php/apc.sls index 4f18f47..5c960b7 100644 --- a/php/apc.sls +++ b/php/apc.sls @@ -6,4 +6,4 @@ include: php-apc: pkg: - installed - - name: {{ php.apc-pkg }} + - name: {{ php.apc_pkg }} diff --git a/php/curl.sls b/php/curl.sls index a35358f..e02d807 100644 --- a/php/curl.sls +++ b/php/curl.sls @@ -6,4 +6,4 @@ include: php-curl: pkg - installed - - name: {{ php.curl-pkg }} + - name: {{ php.curl_pkg }} diff --git a/php/fpm.sls b/php/fpm.sls index a702380..5b6e66a 100644 --- a/php/fpm.sls +++ b/php/fpm.sls @@ -6,8 +6,8 @@ include: php-fpm: pkg: - installed - - name: {{ php.fpm-pkg }} + - name: {{ php.fpm_pkg }} service: - running - - name: {{ php.fpm-service }} + - name: {{ php.fpm_service }} - enable: True diff --git a/php/gd.sls b/php/gd.sls index 32c79a9..25eac62 100644 --- a/php/gd.sls +++ b/php/gd.sls @@ -6,4 +6,4 @@ include: php-gd: pkg: - installed - - name: {{ php.gd-pkg }} + - name: {{ php.gd_pkg }} diff --git a/php/init.sls b/php/init.sls index bd31f0e..6272e40 100644 --- a/php/init.sls +++ b/php/init.sls @@ -6,4 +6,4 @@ include: php: pkg: - installed - - name: {{ php.php-pkg }} + - name: {{ php.php_pkg }} diff --git a/php/mcrypt.sls b/php/mcrypt.sls index 47c39b7..0c259a6 100644 --- a/php/mcrypt.sls +++ b/php/mcrypt.sls @@ -6,4 +6,4 @@ include: php-mcrypt: pkg: - installed - - name: {{ php.mcrpyt-pkg }} + - name: {{ php.mcrpyt_pkg }} diff --git a/php/pear.sls b/php/pear.sls index d6a95eb..c696f8a 100644 --- a/php/pear.sls +++ b/php/pear.sls @@ -6,4 +6,4 @@ include: php-pear: pkg: - installed - - name : {{ php.pear-pkg }} + - name : {{ php.pear_pkg }} From ce07cacadccbe7dfb7f074bd4e679ecbec34da1f Mon Sep 17 00:00:00 2001 From: Forrest Alvarez Date: Thu, 2 Jan 2014 05:25:55 +0000 Subject: [PATCH 08/11] Forgot to update my redhat variables. --- php/map.jinja | 16 ++++++++-------- php/mysql.sls | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/php/map.jinja b/php/map.jinja index 8e178ab..e58b74d 100644 --- a/php/map.jinja +++ b/php/map.jinja @@ -12,13 +12,13 @@ }, 'RedHat': { 'php_pkg': 'php', - 'apc-pkg': 'php-pecl-apc', - 'curl-pkg': 'php-curl', - 'fpm-pkg': 'php-fpm', - 'gd-pkg': 'php-gd', - 'mcrypt-pkg': 'php-mcrypt', - 'mysql-pkg': 'php-mysql', - 'pear-pkg': ' php-pear', - 'fpm-service': 'php-fpm', + 'apc_pkg': 'php-pecl-apc', + 'curl_pkg': 'php-curl', + 'fpm_pkg': 'php-fpm', + 'gd_pkg': 'php-gd', + 'mcrypt_pkg': 'php-mcrypt', + 'mysql_pkg': 'php-mysql', + 'pear_pkg': ' php-pear', + 'fpm_service': 'php-fpm', }, }, merge=salt['pillar.get']('php:lookup')) %} diff --git a/php/mysql.sls b/php/mysql.sls index a2d961e..054f79b 100644 --- a/php/mysql.sls +++ b/php/mysql.sls @@ -6,4 +6,4 @@ include: php-mysql: pkg: - installed - - name: {{ php.mysql-pkg }} + - name: {{ php.mysql_pkg }} From cfd3538280addc2139d9eaf53d2dcd6d589e8ba9 Mon Sep 17 00:00:00 2001 From: Forrest Alvarez Date: Thu, 2 Jan 2014 05:30:26 +0000 Subject: [PATCH 09/11] Fixed a misspelled item, fixed a typo in gd. --- php/gd.sls | 2 +- php/mcrypt.sls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php/gd.sls b/php/gd.sls index 25eac62..3769b1a 100644 --- a/php/gd.sls +++ b/php/gd.sls @@ -1,4 +1,4 @@ -{{% from "php/map.jinja" import php with context %} +{% from "php/map.jinja" import php with context %} include: - apt diff --git a/php/mcrypt.sls b/php/mcrypt.sls index 0c259a6..6d155b0 100644 --- a/php/mcrypt.sls +++ b/php/mcrypt.sls @@ -6,4 +6,4 @@ include: php-mcrypt: pkg: - installed - - name: {{ php.mcrpyt_pkg }} + - name: {{ php.mcrypt_pkg }} From cec0e7d3e63dc823e573aac562adc6f1710c8f64 Mon Sep 17 00:00:00 2001 From: Forrest Alvarez Date: Thu, 2 Jan 2014 05:33:29 +0000 Subject: [PATCH 10/11] typo in the curl state. --- php/curl.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/curl.sls b/php/curl.sls index e02d807..ca6d9ba 100644 --- a/php/curl.sls +++ b/php/curl.sls @@ -4,6 +4,6 @@ include: - apt php-curl: - pkg + pkg: - installed - name: {{ php.curl_pkg }} From e6e876b4ea033453d0bf4262323c794fbcf645df Mon Sep 17 00:00:00 2001 From: Forrest Alvarez Date: Thu, 2 Jan 2014 05:40:16 +0000 Subject: [PATCH 11/11] fixed an error in fpm, and modified the curl value for redhat to be just curl, as php-common contains curl, which is installed when php gets installed. --- php/fpm.sls | 2 +- php/map.jinja | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php/fpm.sls b/php/fpm.sls index 5b6e66a..44ee160 100644 --- a/php/fpm.sls +++ b/php/fpm.sls @@ -1,4 +1,4 @@ -{{% from "php/map.jinja" import php with context %} +{% from "php/map.jinja" import php with context %} include: - apt diff --git a/php/map.jinja b/php/map.jinja index e58b74d..c2ddfe3 100644 --- a/php/map.jinja +++ b/php/map.jinja @@ -13,7 +13,7 @@ 'RedHat': { 'php_pkg': 'php', 'apc_pkg': 'php-pecl-apc', - 'curl_pkg': 'php-curl', + 'curl_pkg': 'curl', 'fpm_pkg': 'php-fpm', 'gd_pkg': 'php-gd', 'mcrypt_pkg': 'php-mcrypt',