Commit Graph

408 Commits

Author SHA1 Message Date
Kurt Bendlin
ef5d8ef204 don't change composer.sls in oauth-branch 2015-05-21 11:49:27 +02:00
Kurt Bendlin
f51fe7ccb7 add oauth in php.ng 2015-05-21 11:35:06 +02:00
Kurt Bendlin
d723b7b87c require packages curl and cli. This also prevents the installing of apache on apt-get-systems 2015-05-21 11:26:30 +02:00
Nitin Madhok
05580656db Merge pull request #40 from kurt---/master
add sls for installed php-oauth
2015-05-17 15:13:51 -04:00
Kurt Bendlin
224b391c99 Merge remote-tracking branch 'origin/master' 2015-05-17 17:17:47 +02:00
Kurt Bendlin
547d62bff4 we also need the map,jinja-entry 2015-05-17 16:59:42 +02:00
Kurt Bendlin
e21b8c034c add oath.sls 2015-05-17 16:59:42 +02:00
Kurt Bendlin
684a712a89 we also need the map,jinja-entry 2015-05-17 16:50:16 +02:00
Kurt Bendlin
24e2e6cf78 add oath.sls 2015-05-17 16:43:52 +02:00
Forrest
59b99bef7b Merge pull request #38 from Seldaek/master
Fix ppa support in php.ng, fixes #36
2015-04-25 16:30:30 -07:00
Jordi Boggiano
6e6756a9f7 Fix ppa support in php.ng, fixes #36 2015-04-25 15:18:04 +01:00
Wolodja Wentland
d1524bf311 Merge pull request #37 from Seldaek/master
Add apcu support
2015-04-25 15:41:55 +02:00
Jordi Boggiano
3f1bb7d964 Add apcu support 2015-04-25 11:35:29 +01:00
Forrest
3fe85ca0b4 Merge pull request #34 from aboe76/opensuse_support
Added opensuse support
2015-03-09 14:54:22 -07:00
Niels Abspoel
1fd98a6eaf Added opensuse support
See README.rst for more information
2015-03-09 22:22:48 +01:00
Forrest
2cf2d020e2 Merge pull request #32 from xclusv/feature-composer
Add php.composer state
2015-03-06 11:50:26 -08:00
Niels Abspoel
22ac3fdbe4 Merge pull request #33 from jeroen92/master
Sqlite support
2015-03-06 20:44:51 +01:00
jeroen92
be2f5d7a0d Fix php(5) typo 2015-03-06 15:49:06 +01:00
jeroen92
8194cba6aa Add sqlite support 2015-03-06 15:42:00 +01:00
Ross Perkins
a652f89398 Removed 'install' dependency, using 'mv' instead. 2015-03-06 11:56:35 +01:00
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