Commit Graph

138 Commits

Author SHA1 Message Date
Ross Perkins
5a5a9c15d0 Merge remote-tracking branch 'upstream/master' into feature-composer 2015-03-04 12:48:03 +01:00
Forrest
6eabe99dfb Merge pull request #31 from aboe76/apache2_debian_ini
add libapache2-mod-php5 options on debian only
2015-02-25 13:01:53 -08:00
Niels Abspoel
9df35f0c82 add libapache2-mod-php5 options on debian only 2015-02-25 21:51:16 +01:00
Ross Perkins
657a4bf4c2 Fixed render error 2015-02-21 12:43:51 +01:00
Ross Perkins
2780ad7e77 Added Composer support 2015-02-20 11:12:19 +01:00
Nitin Madhok
2147067ca2 Merge pull request #30 from mschiff/master
fix comment typo
2015-01-15 22:19:19 +05:30
Marc Schiffbauer
7685f9a800 fix comment typo 2015-01-15 17:39:52 +01:00
Niels Abspoel
1ece27dd74 Merge pull request #28 from giannello/patch-1
Update mysqlnd.sls
2015-01-03 23:28:05 +01:00
Giuseppe Iannello
38f853c853 Update mysqlnd.sls
The php extension is mysqlnd, not mysqld
2015-01-03 20:05:47 +01:00
Wolodja Wentland
03b320eeb2 Merge pull request #27 from ckng/features/redis
Added PHP Redis module
2014-12-17 11:12:37 +01:00
Chin Kiong, Ng
5d7a03fd19 Updated README 2014-12-17 17:53:35 +08:00
Chin Kiong, Ng
bec65b8875 Merge branch 'features/redis'
Conflicts:
	php/map.jinja
	php/ng/map.jinja
2014-12-17 17:39:30 +08:00
Chin Kiong, Ng
0c66177ed0 Added PHP Redis module 2014-12-17 17:36:53 +08:00
Nitin Madhok
9464623c09 Merge pull request #26 from ckng/features/xml
Fixed Ubuntu/Debian xml package name and extra space typo
2014-12-17 04:28:17 -05:00
Chin Kiong, Ng
0704c75b7d Fixed Ubuntu/Debian xml package name and extra space typo 2014-12-17 17:12:30 +08:00
Nitin Madhok
766f092204 Merge pull request #24 from saltstack-formulas/style-short-dec
Change states to use short-dec style
2014-12-13 06:46:59 -05:00
Seth House
b35ea39b5d Change states to use short-dec style 2014-12-13 00:19:59 -07:00
Nitin Madhok
82e2cd3a69 Merge pull request #23 from iamseth/master
fix imagick package name for RedHat systems
2014-11-23 16:56:20 -05:00
Seth Miller
9c2e178fe3 fix imagick package name for RedHat systems 2014-11-23 15:52:09 -06:00
Nitin Madhok
094a2d499c Merge pull request #21 from Cottser/use_ppa_optional
Make use_ppa optional
2014-10-24 17:46:06 -07:00
Scott Reeves
67def91262 Make use_ppa optional 2014-10-24 20:29:03 -04:00
Nitin Madhok
1baffad4e4 Merge pull request #20 from wdalmut/master
Add example information
2014-08-22 07:26:08 -04:00
Walter Dal Mut
6ebf75fbb5 Add example information 2014-08-22 09:38:56 +02:00
Forrest
3547c933a9 Merge pull request #19 from wdalmut/master
Added mongo extension via pecl and use ppa for php
2014-08-21 10:57:31 -07:00
Walter Dal Mut
d14b686e5e Added mongo extension via pecl and use ppa for php 2014-08-21 15:14:28 +02:00
Forrest
e8b3030c1f Merge pull request #18 from mkhubbard/feature/intl
New module: intl
2014-08-10 18:59:15 -07:00
Michael Hubbard
0503ba52b3 New module: intl 2014-08-10 21:51:16 -04:00
Nitin Madhok
a4f02c1474 Update README.rst
Fix broken link
2014-07-28 19:18:08 -04:00
Joseph Hall
c705526d2c Merge pull request #15 from spsoit/master
Fixes incomplete requisites for fpm.init
2014-06-19 14:26:32 -06:00
Chad Heuschober
a66684260d Fixes incomplete requisites for fpm.init 2014-06-19 15:56:01 -04:00
Seth House
feb3c03e54 Merge pull request #14 from spsoit/master
Adds NG states to php-formula
2014-06-08 00:04:27 -06:00
Chad Heuschober
7f90be9f9f Finishes first-pass documentation and fixes minor niggle in pools_config. 2014-06-06 15:06:49 -04:00
Chad Heuschober
ef19addb98 Cleaned up pools. 2014-06-06 14:53:36 -04:00
Chad Heuschober
0a8b0ceaf1 Fixed broken test ininstalled.jinja 2014-06-06 13:21:22 -04:00
Chad Heuschober
b8278ba19a Fixed mixxing set in installed.jinja 2014-06-06 13:20:03 -04:00
Chad Heuschober
116f3fae70 Rewrote ini and cli.ini handling 2014-06-06 13:14:44 -04:00
Chad Heuschober
7268b7d69e Merge branch 'master' of github.com:saltstack-formulas/php-formula 2014-06-05 16:31:49 -04:00
Chad Heuschober
c2435a397f Fixes serialization issues with the ini files. Still has an unhealthy dependency on odict() and cannot recurse its method. Macro.jinja has additional methods that should also be pruned once 2014-05-22 14:38:27 -04:00
Seth House
f7526d5daf Merge pull request #13 from taion809/feature_addJson
This commit adds the php-json package.
2014-05-22 11:47:25 -06:00
Nicholas J
0d0cf6827d This commit adds the php-json package.
The json features of php have been moved to a separate package in the following distributions:
  - Debian >= 8 (jessie)
  - Ubuntu >= 13.04

Changes:
  - Added json.sls
  - Updated map.jinja
  - Updated README.md
2014-05-22 10:43:58 -04:00
Chad Heuschober
0b65d5aaea Tightened up some ng requirements. 2014-05-21 00:48:52 -04:00
Chad Heuschober
9c5ef0395b Tightened up some ng requirements. 2014-05-21 00:46:56 -04:00
Chad Heuschober
5b18a9a4b7 Cleaned up the installed package bit. 2014-05-20 22:07:16 -04:00
Chad Heuschober
5e304544ed Adds full fpm pools management. 2014-05-20 15:59:25 -04:00
Clayton Kramer
cfe623fab4 New state for managing the php.ini file. 2014-05-19 16:54:29 -04:00
Seth House
d34aab670c Merge pull request #11 from giannello/master
Fix #9 - Add explicit installation for php-cgi
2014-04-09 18:41:49 -06:00
Giuseppe Iannello
be040a1229 Fix #9 - Add explicit installation for php-cgi 2014-04-09 20:06:30 +02:00
Seth House
05f81e7248 Merge pull request #10 from giannello/master
Add MySQL native driver extension
2014-04-09 11:15:40 -06:00
Giuseppe Iannello
b97bd298b9 Fixed README order 2014-04-09 16:53:26 +02:00
Giuseppe Iannello
4f45372ff3 Added php-cli package 2014-04-09 16:52:01 +02:00