Commit Graph

233 Commits

Author SHA1 Message Date
Wolodja Wentland
58c73054ea Do not include php state in php.fpm
Including php in php.fpm makes it hard to use php fpm with webservers such as
nginx or lighttpd on, at least, Debian and derivatives.

This fixes #124.
2017-03-08 16:06:57 +00:00
Vitali Quiering
51984f06de Make php.ng.maps.jinja work for php5 on Debian. Fixed config dir. 2017-02-16 10:42:15 +01:00
Vitali Quiering
6b74439a81 Changed php-redis pkg name in map.jinja for php.ng 2017-01-30 15:39:40 +01:00
Vitali Quiering
980a5f50e7 Add elif statement in ng/maps.jinja to ensure packages for Debian 2017-01-30 12:31:28 +01:00
sc250024
1e3e3032f3 New structure for new Ubuntu PPA and other fixes (#113)
* Initial commit for new branch

* Quick change to base test files

* Updated map.jinja, added `php` dependency for all subformulas

* Fixing mongo module and map.jinja needed OpenSSL dev libraries

* Should be final changes needed for Mongo module

* Updating Suhosin package since many distros don't have package in their
repos anymore

* Generalizing suhosin module, and updating pillar.example for new PPA

* Adding addtional logic for RedHat based families to Suhosin

* Initial commit of NG refactored map.jinja file

* Deleting FFMpeg state file since the module is quite old, and has been
replaced by using a Composer library. See
https://github.com/PHP-FFMpeg/PHP-FFMpeg for details

* Updating NG formulas for new definitions

* Removing 'twig' as a state since it can be installed via Composer

* Changes to installed.jinja to set correct PHP path based on version

* NG Composer and NG Suhosin changes

* Version bump and deleting README for deleted states

* Finished refactor of NG map.jinja file

* Adding trailing commas (forgot them earler)

* Adding changes list, and modifying map file for missing definitions when
using Ubuntu 16.04 and NOT using a PPA

* Changes needed after performing testing on RHEL 7

* Changes needed for Ubuntu Trusty without using PPA

* Removing testing files; keep on local

* Map changes needed after testing Debian Jessie

* Changed needed for Debian Wheezy

* Adding more pkgs for Arch Linux support

* More ArchLinux support

* Stupid tabs

* Removing extra line breaks, and using the general "use_external_repo" in
the future if DotDeb (Debian) or Webtactic (RedHat)

* Accoutning for Precise `phpenmod` and others
2016-12-13 13:37:53 -08:00
Aidan Harris
aba45febe0 Add xdebug package for RedHat family operating systems in map.jina 2016-12-10 22:02:50 +00:00
Alexey Genus
cb4515b467 Add php-mongodb and php-mongo plugins support 2016-12-08 00:10:19 +03:00
Christian McHugh
a1f445d99f add php-bcmath 2016-10-22 20:25:51 +01:00
Christoffer Stokbaek
d987669080 Added net-ipv4/6 and pear to map.jinja 2016-09-16 15:56:43 +02:00
Niels Abspoel
e890b2aba9 Merge pull request #107 from stokbaek/master
Added missing settings for ubuntu.
2016-08-29 19:35:24 +02:00
Wolodja Wentland
8e9e51d692 Remove dotdeb from php state
The included state was never submitted in
https://github.com/saltstack-formulas/php-formula/pull/77 and we
therefore remove inclusion here to allow users to use the php state
again.
2016-08-25 16:50:19 +02:00
Christoffer Stokbaek
3848f30d75 Added missing settings for ubuntu. 2016-07-25 16:20:26 +02:00
Wolodja Wentland
41f417be16 Remove duplicate dev_pkg entries.
This was introduced in #86 and really should have never been released.
2016-07-25 14:50:56 +02:00
Niels Abspoel
9ff852b4b0 add missing sls files and readme 2016-07-13 09:59:30 +02:00
Rene Jochum
ce9ce324ce Allow overwriting the fpm pools config name via 'filename'.
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-12 19:20:16 +02:00
Niels Abspoel
fd1612bf2d add more missing modules 2016-07-12 15:05:29 +02:00
Niels Abspoel
d7331e5f78 add some missing modules for debian and ubuntu 2016-07-11 13:27:55 +02:00
Niels Abspoel
e27f49f136 update map.jinja with removed archlinux and fpm support 2016-07-09 21:45:42 +02:00
Forrest
df5e84087a Merge pull request #100 from genuss/fix_map.jinja
Add intl package name for php7.0
2016-07-08 09:25:46 -07:00
a.genus
1dca17acfa Add intl package name for php7.0 2016-07-08 12:25:07 +03:00
Aline Freitas
8aaff98176 Add support for Ubuntu Xenial Xerus (16.04). 2016-07-07 20:14:32 -03:00
a.genus
4cfc5ba013 Add php-gearman support 2016-07-06 12:31:15 +03:00
Ryan Hayle
a01466d076 Add missing default package names for Debian/php7.
This was causing an error with the php.ng.redis and php.ng.xdebug states.
2016-07-01 14:33:45 -05:00
Kenneth Oestrup
d5fb8d3128 Added SNMP module for PHP NG 2016-06-28 11:48:37 +02:00
Alex Powell
de96c787d5 Fixing composer with php7.
Fixing php7 pgsql package definition.
Adding mbstring and sqlite package definitions for php7.
2016-06-01 19:03:31 +01:00
John Carlyle-Clarke
65e7971a44 Fix for broken test statement that prevents PPA workaround ever executing 2016-05-25 14:50:21 +00:00
Tadas Barzdzius
04fe02d431 Add composer package 2016-05-04 12:49:29 +03:00
Niels Abspoel
33ea716515 add php-zip 2016-05-02 21:58:00 +02:00
Niels Abspoel
bbd7161292 add php-apcu for debian stretch (7.0) 2016-05-02 21:22:29 +02:00
Roman Pertl
3715bfd9ac adding missing geoip module support with arch linux 2016-05-02 18:42:56 +00:00
Roman Pertl
3183009339 adding support for php tidy module (currently arch only tested) 2016-05-02 18:42:29 +00:00
Wolodja Wentland
c780e165e5 Do not hardcode composer checksum
This allows composer installs to function even if the installer checksum
changes, and doesn't force us to update the formula whenever their
installer changes.

We can do this now as composer upstream provides the checksum on
https://composer.github.io/installer.sig since 2016-04-28.
2016-04-29 10:53:57 +02:00
Forrest
61fa912834 Merge pull request #80 from aboe76/debian_php7
Update php ng map with debian php 7.0
2016-04-27 17:33:15 -07:00
Forrest
328224a63e Merge pull request #81 from babilen/set-composer-home
Explicitly set HOME when running composer install.
2016-04-27 17:31:53 -07:00
Tadas Barzdzius
80f6a98b29 Add default pools settings to fix issue #47 2016-04-27 19:03:08 +03:00
Wolodja Wentland
e9b1c4ce07 Explicitly set HOME when running composer install.
Without this installation fails with:

  The HOME or COMPOSER_HOME environment variable must be set for
  composer to install correctly
2016-04-27 15:43:44 +02:00
Niels Abspoel
fdcdb2de97 Update php ng map with debian php 7.0
minor improvements to archlinux php cli.
2016-04-27 14:16:14 +02:00
Tadas Barzdzius
4f16779ffb Add opcache package 2016-04-16 17:25:27 +03:00
Wolodja Wentland
f1aa592207 Update composer installer sha256 hash 2016-04-14 13:30:14 +02:00
Bogdan Radulescu
6e87843aa9 Added a bunch of new PHP7 packages and fixed fpm_service for PHP5 2016-03-30 04:42:06 -07:00
Bogdan Radulescu
8fc048a4b5 Added the readline PHP package and support for PHP7 in Debian. 2016-03-29 07:48:03 -07:00
Wolodja Wentland
70b995041d Run composer installer with PHP
The composer installer has to be executed with PHP itself as detailed on
https://getcomposer.org/download/.
2016-02-29 18:08:55 +01:00
Zachary Softich
0aa92cbcc9 Only add ppa if it doesn't exist.
This comit is in addition to pull request #70. The add-apt-repository command
will only be run when the ppa has not yet been added.
2015-12-23 09:57:06 -06:00
Bogdan Radulescu
7c2bd44ae9 Added the php-mail package for Debian 2015-12-16 13:24:03 +00:00
Ryan Hayle
1016376bcf Add repo manually (work-around for saltstack/salt#23543) 2015-12-10 20:54:17 -06:00
Rowcliffe Browne
b19c59c2a9 changed hhvm PID filepath to match default /etc/init.d/hhvm PID filepath 2015-10-28 16:12:15 +08:00
Forrest
256145736a Merge pull request #64 from danoe/dev
manage xcache.ini in pillar
2015-10-23 15:36:52 -07:00
Daniel Oetken
861ddd2db4 manage xcache.ini in pillar 2015-10-24 00:19:23 +02:00
Forrest
a81c52924c Merge pull request #62 from cybacolt/master
use False as default, and test boolean, rather than none
2015-10-23 11:28:22 -07:00
Heinz Wiesinger
d62a6b5d7e Sort keys per section within php.ini. 2015-10-23 15:07:44 +02:00
Rowcliffe Browne
0385663637 use False as default, and test boolean, rather than none 2015-10-23 15:34:58 +08:00
Daniel Oetken
ebd7e2a475 Add xcache support to php ng formula 2015-10-22 17:54:17 +02:00
Matt Kelch
2567557fac Fix edge case with install-composer which results in composer not being installed/reinstalled due to the state of get-composer not changing. 2015-09-28 13:45:56 -04:00
Teoh Han Hui
9c0173dad0 Recursively merge php.ini options 2015-08-14 09:36:00 +00:00
Niels Abspoel
f5c967fb6c Improve config file handling hhvm.
In order to reuse the default structure of this formula
I changed the config a little bit to configure hhvm files.
2015-07-25 22:15:28 +02:00
Niels Abspoel
b3e64eb600 Add hhvm support to php ng formula 2015-07-25 11:39:50 +02:00
Nitin Madhok
16e7cb083b Merge pull request #42 from teohhanhui/patch-1
Fix Debian package name for `php.ng.xml` state
2015-07-22 05:12:18 -04:00
Hayden King
77c6e9b2c0 add composer bin and hash variables so it could be overridden in pillar if needed. 2015-07-19 18:01:34 -05:00
Hayden King
f3e4197fcb remove curl dependency in favor of saltstack file.managed and use the composer instlaller. 2015-07-19 18:00:44 -05:00
Vu Nguyen
d6eec332a8 Add gmp to map 2015-07-16 11:02:38 +07:00
Vu Nguyen
8f0b16110e Add support for gmp lib in ng 2015-07-16 10:58:10 +07:00
René Jochum
ca15a1fa4e Use iteritems() instead of items().
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-13 16:02:46 +02:00
Teoh Han Hui
3f3467d17a Fix Debian package name for php.ng.xml state
XML module is already built-in. In any case, `php5-xmlrpc` package actually provides XML-RPC module.
2015-06-25 19:22:26 +08:00
Nitin Madhok
5601d5e2a4 Merge pull request #49 from imran1008/list-of-extensions
Allow pillars to specify a list of extensions
2015-06-22 03:13:13 -04:00
Edvinas Klovas
dacadfe660 Add php.ng.xsl for Debian 2015-06-22 02:51:57 +03:00
Imran Haider
f59b474b83 Add support for Arch Linux 2015-06-20 14:37:09 -04:00
Imran Haider
b7dd176c84 Allow pillars to specify a list of extensions 2015-06-20 14:35:21 -04:00
Niels Abspoel
f726efdb1e Merge pull request #44 from kurt---/oauth
install php5-oauth in php.ng.style
2015-06-15 19:44:08 +02:00
Edvinas Klovas
8c148dc4f6 add php.ng.geoip, php.ng.pspell, php.ng.xdebug for Debian 2015-05-29 17:42:16 +03:00
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
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
Jordi Boggiano
6e6756a9f7 Fix ppa support in php.ng, fixes #36 2015-04-25 15:18:04 +01:00
Jordi Boggiano
3f1bb7d964 Add apcu support 2015-04-25 11:35:29 +01: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
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
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
Giuseppe Iannello
38f853c853 Update mysqlnd.sls
The php extension is mysqlnd, not mysqld
2015-01-03 20:05:47 +01: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
Chin Kiong, Ng
0704c75b7d Fixed Ubuntu/Debian xml package name and extra space typo 2014-12-17 17:12:30 +08:00
Seth House
b35ea39b5d Change states to use short-dec style 2014-12-13 00:19:59 -07:00
Seth Miller
9c2e178fe3 fix imagick package name for RedHat systems 2014-11-23 15:52:09 -06:00
Scott Reeves
67def91262 Make use_ppa optional 2014-10-24 20:29:03 -04:00
Walter Dal Mut
d14b686e5e Added mongo extension via pecl and use ppa for php 2014-08-21 15:14:28 +02:00
Michael Hubbard
0503ba52b3 New module: intl 2014-08-10 21:51:16 -04:00
Chad Heuschober
a66684260d Fixes incomplete requisites for fpm.init 2014-06-19 15:56:01 -04: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
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
Giuseppe Iannello
be040a1229 Fix #9 - Add explicit installation for php-cgi 2014-04-09 20:06:30 +02:00
Giuseppe Iannello
4f45372ff3 Added php-cli package 2014-04-09 16:52:01 +02:00
Giuseppe Iannello
195a411abb Added MySQL Native Driver extension 2014-04-09 16:42:42 +02:00
giannello
c0cd87cc1f Added mapping for MySQL Native Driver extension 2014-04-09 16:41:35 +02:00
Fintan MacMahon
5e3ac849e4 Fixed typo 2014-02-18 12:18:44 +00:00
Fintan MacMahon
9b4b2ad8ef Added additional modules. 2014-02-14 13:38:20 +00:00
Bogdan Rădulescu
3a2a877061 New module: php-soap 2014-02-07 13:17:35 +00:00
Bogdan Rădulescu
e89a0666b8 New modules: mbstring and xml
In RedHat, Fedora and CentOS mbstring and xml are not compiled by default in PHP
In Debian these are compiled by default so the generic php5 package was specified
2014-02-06 13:43:13 +00:00
Bogdan Rădulescu
4114e9b09c New modules: memcache & memcached 2014-01-17 13:02:32 +00:00
Forrest Alvarez
a4a035499b Updated README to have all the states properly set up, dropped the apt requirement from everything. 2014-01-03 06:10:51 +00:00
Forrest Alvarez
e6e876b4ea 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. 2014-01-02 05:40:16 +00:00
Forrest Alvarez
cec0e7d3e6 typo in the curl state. 2014-01-02 05:33:29 +00:00
Forrest Alvarez
cfd3538280 Fixed a misspelled item, fixed a typo in gd. 2014-01-02 05:30:26 +00:00
Forrest Alvarez
ce07cacadc Forgot to update my redhat variables. 2014-01-02 05:25:55 +00:00
Forrest Alvarez
17154c06d4 Fixed variable naming that was creating errors. 2014-01-02 05:23:17 +00:00
Forrest Alvarez
b877441585 Fixed some name issues for the php packages between distros. 2014-01-02 05:20:11 +00:00
Forrest Alvarez
1792773891 Fixed an incorrect character which was messing things up in the map. 2014-01-02 05:02:15 +00:00
Forrest Alvarez
b9002cc3d5 Some more fixes for the OS name from testing. 2014-01-02 05:01:12 +00:00
Forrest Alvarez
97ab7e7405 Fixed some spots where I forgot to reference the map properly. 2014-01-02 04:55:36 +00:00
Forrest Alvarez
713ffba889 fixed some typos 2014-01-02 04:51:53 +00:00
Forrest Alvarez
ea5ee43cc6 First rework of php formula to bring it up to standards. 2013-11-27 05:55:10 +00:00
Alan McNea
7309a56ed2 Changed php5 calls to more generic php 2013-07-29 22:27:43 +00:00
Alan McNea
733ce3c218 Removed core namespace 2013-07-29 22:19:22 +00:00
Alan McNea
fa56b3dcee Added my stuff 2013-07-29 22:17:02 +00:00
Michael Grosser
27962b049d Add basic structure according to guidelines. 2013-07-27 20:36:06 +02:00