From fa56b3dcee80f592b6cd9f2b3bc8e98366ee63c0 Mon Sep 17 00:00:00 2001 From: Alan McNea Date: Mon, 29 Jul 2013 22:17:02 +0000 Subject: [PATCH 1/5] Added my stuff --- php/apc.sls | 10 ++++++++++ php/curl.sls | 10 ++++++++++ php/fpm.sls | 13 +++++++++++++ php/gd.sls | 10 ++++++++++ php/init.sls | 10 ++++++++++ php/mcrypt.sls | 10 ++++++++++ php/mysql.sls | 10 ++++++++++ php/pear.sls | 10 ++++++++++ 8 files changed, 83 insertions(+) create mode 100644 php/apc.sls create mode 100644 php/curl.sls create mode 100644 php/fpm.sls create mode 100644 php/gd.sls create mode 100644 php/mcrypt.sls create mode 100644 php/mysql.sls create mode 100644 php/pear.sls diff --git a/php/apc.sls b/php/apc.sls new file mode 100644 index 0000000..7e814f4 --- /dev/null +++ b/php/apc.sls @@ -0,0 +1,10 @@ +include: + - core.apt + +{% if grains['os']=="Ubuntu" %} + +php-apc: + pkg.installed: + - order: 180 + +{% endif %} diff --git a/php/curl.sls b/php/curl.sls new file mode 100644 index 0000000..807291a --- /dev/null +++ b/php/curl.sls @@ -0,0 +1,10 @@ +include: + - core.apt + +{% if grains['os']=="Ubuntu" %} + +php5-curl: + pkg.installed: + - order: 180 + +{% endif %} diff --git a/php/fpm.sls b/php/fpm.sls new file mode 100644 index 0000000..7709d71 --- /dev/null +++ b/php/fpm.sls @@ -0,0 +1,13 @@ +include: + - core.apt + +{% if grains['os']=="Ubuntu" %} + +php5-fpm: + pkg.installed: + - order: 175 + service.running: + - enable: True + - order: 455 + +{% endif %} diff --git a/php/gd.sls b/php/gd.sls new file mode 100644 index 0000000..fef0927 --- /dev/null +++ b/php/gd.sls @@ -0,0 +1,10 @@ +include: + - core.apt + +{% if grains['os']=="Ubuntu" %} + +php5-gd: + pkg.installed: + - order: 180 + +{% endif %} diff --git a/php/init.sls b/php/init.sls index e69de29..d81935b 100644 --- a/php/init.sls +++ b/php/init.sls @@ -0,0 +1,10 @@ +include: + - core.apt + +{% if grains['os']=="Ubuntu" %} + +php5: + pkg.installed: + - order: 175 + +{% endif %} diff --git a/php/mcrypt.sls b/php/mcrypt.sls new file mode 100644 index 0000000..09ddd1a --- /dev/null +++ b/php/mcrypt.sls @@ -0,0 +1,10 @@ +include: + - core.apt + +{% if grains['os']=="Ubuntu" %} + +php5-mcrypt: + pkg.installed: + - order: 180 + +{% endif %} diff --git a/php/mysql.sls b/php/mysql.sls new file mode 100644 index 0000000..a99ea48 --- /dev/null +++ b/php/mysql.sls @@ -0,0 +1,10 @@ +include: + - core.apt + +{% if grains['os']=="Ubuntu" %} + +php5-mysql: + pkg.installed: + - order: 180 + +{% endif %} diff --git a/php/pear.sls b/php/pear.sls new file mode 100644 index 0000000..33635f6 --- /dev/null +++ b/php/pear.sls @@ -0,0 +1,10 @@ +include: + - core.apt + +{% if grains['os']=="Ubuntu" %} + +php-pear: + pkg.installed: + - order: 180 + +{% endif %} From 733ce3c2181f5051d16e7dcbf07556194f9f8df3 Mon Sep 17 00:00:00 2001 From: Alan McNea Date: Mon, 29 Jul 2013 22:19:22 +0000 Subject: [PATCH 2/5] Removed core namespace --- php/apc.sls | 2 +- php/curl.sls | 2 +- php/fpm.sls | 2 +- php/gd.sls | 2 +- php/init.sls | 2 +- php/mcrypt.sls | 2 +- php/mysql.sls | 2 +- php/pear.sls | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/php/apc.sls b/php/apc.sls index 7e814f4..6241fad 100644 --- a/php/apc.sls +++ b/php/apc.sls @@ -1,5 +1,5 @@ include: - - core.apt + - apt {% if grains['os']=="Ubuntu" %} diff --git a/php/curl.sls b/php/curl.sls index 807291a..3193fcf 100644 --- a/php/curl.sls +++ b/php/curl.sls @@ -1,5 +1,5 @@ include: - - core.apt + - apt {% if grains['os']=="Ubuntu" %} diff --git a/php/fpm.sls b/php/fpm.sls index 7709d71..27a2aa3 100644 --- a/php/fpm.sls +++ b/php/fpm.sls @@ -1,5 +1,5 @@ include: - - core.apt + - apt {% if grains['os']=="Ubuntu" %} diff --git a/php/gd.sls b/php/gd.sls index fef0927..a5b5885 100644 --- a/php/gd.sls +++ b/php/gd.sls @@ -1,5 +1,5 @@ include: - - core.apt + - apt {% if grains['os']=="Ubuntu" %} diff --git a/php/init.sls b/php/init.sls index d81935b..e8b5a27 100644 --- a/php/init.sls +++ b/php/init.sls @@ -1,5 +1,5 @@ include: - - core.apt + - apt {% if grains['os']=="Ubuntu" %} diff --git a/php/mcrypt.sls b/php/mcrypt.sls index 09ddd1a..7339b18 100644 --- a/php/mcrypt.sls +++ b/php/mcrypt.sls @@ -1,5 +1,5 @@ include: - - core.apt + - apt {% if grains['os']=="Ubuntu" %} diff --git a/php/mysql.sls b/php/mysql.sls index a99ea48..393488c 100644 --- a/php/mysql.sls +++ b/php/mysql.sls @@ -1,5 +1,5 @@ include: - - core.apt + - apt {% if grains['os']=="Ubuntu" %} diff --git a/php/pear.sls b/php/pear.sls index 33635f6..cb9b1b5 100644 --- a/php/pear.sls +++ b/php/pear.sls @@ -1,5 +1,5 @@ include: - - core.apt + - apt {% if grains['os']=="Ubuntu" %} From 7309a56ed2fe39a6edd9369fd8090a3deb06a375 Mon Sep 17 00:00:00 2001 From: Alan McNea Date: Mon, 29 Jul 2013 22:27:43 +0000 Subject: [PATCH 3/5] 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 %} From b0a0d92a6ed79763540bc8bb9594e4c5798c265e Mon Sep 17 00:00:00 2001 From: Alan McNea Date: Mon, 29 Jul 2013 22:37:17 +0000 Subject: [PATCH 4/5] Updated README.rst --- README.rst | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 9530388..b79fd95 100644 --- a/README.rst +++ b/README.rst @@ -1,2 +1,25 @@ php -=== +====== +DEPENDENCIES: + These salt-states are required: + + 1) apt + +ORDERING: + +The ordering of the states for php falls into block ranges which are: + + 1) php will use 1-500 for ordering + 2) php will reserve 1 -100 as unused + 3) php will reserve 101-150 for pre pkg install + 4) php will reserve 151-200 for pkg install + 5) php will reserve 201-250 for pkg configure + 6) php will reserve 251-300 for downloads, git stuff, load data + 7) php will reserve 301-400 for unknown purposes + 8) php will reserve 401-450 for service restart-reloads + 9) php WILL reserve 451-460 for service.running + 10) php will reserve 461-500 for cmd requiring operational services + +PILLARS: + + No Pillars are used in this formula as of yet. From 8b6734b3252ad91ca518dea97b6cbc3833dc3399 Mon Sep 17 00:00:00 2001 From: Alan McNea Date: Mon, 5 Aug 2013 20:12:18 +0000 Subject: [PATCH 5/5] Fixed wording in README --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index b79fd95..3abc4ed 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ php ====== DEPENDENCIES: - These salt-states are required: + These formulas are required: 1) apt