Commit Graph

223 Commits

Author SHA1 Message Date
Niels Abspoel
74a60ccf8f Merge pull request #125 from babilen/fix-124
Do not include php state in php.fpm
2017-03-08 21:42:04 +01:00
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
Niels Abspoel
ee6ae4fd33 Merge pull request #118 from hackel/patch-2
Update pillar.example to reflect new structure
2017-02-16 22:43:15 +01:00
Niels Abspoel
ba15ee1368 Merge pull request #122 from dmaphy/master
Improvements to php/ng/map.jinja
2017-01-30 18:27:49 +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
Ryan Hayle
76d8758b8a Update pillar.example to reflect new structure
I had to dig through the source to figure this out.  Will need to be updated again once #116 is merged.
2017-01-09 15:13:43 -06: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
Forrest
371fc1f3a7 Merge pull request #115 from aidanharris/xdebug-redhat
Add xdebug package for RedHat family operating systems in map.jina
2016-12-10 15:33: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
Forrest
2a65734a26 Merge pull request #114 from genuss/php_mongo
Add php-mongodb and php-mongo plugins support
2016-12-07 13:37:27 -08:00
Alexey Genus
cb4515b467 Add php-mongodb and php-mongo plugins support 2016-12-08 00:10:19 +03:00
Forrest
aed39883af Merge pull request #112 from mchugh19/master
add php-bcmath
2016-10-22 12:38:04 -07:00
Christian McHugh
a1f445d99f add php-bcmath 2016-10-22 20:25:51 +01:00
Forrest
59b13390d5 Merge pull request #111 from stokbaek/master
Added net-ipv4/6 and pear to map.jinja
2016-09-16 10:05:26 -07: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
Forrest
e3dc107a91 Merge pull request #109 from babilen/fix-dotdeb-malarkey
Remove dotdeb from php state
2016-08-25 09:08:07 -07: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
Nitin Madhok
36bee3cf9d Merge pull request #106 from babilen/fix-php-dev
Remove duplicate `dev_pkg` entries.
2016-07-25 09:21:03 -04: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
Forrest
e6645cfa36 Merge pull request #105 from webscale-formulas/master
add missing sls files and readme
2016-07-13 01:03:26 -07:00
Niels Abspoel
9ff852b4b0 add missing sls files and readme 2016-07-13 09:59:30 +02:00
Forrest
f205838a68 Merge pull request #104 from pcdummy/master
Allow overwriting the fpm pools config name via 'filename'.
2016-07-12 10:26:23 -07: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
Forrest
4a7e63f6ba Merge pull request #103 from webscale-formulas/master
add more missing modules
2016-07-12 09:03:44 -07:00
Niels Abspoel
fd1612bf2d add more missing modules 2016-07-12 15:05:29 +02:00
Forrest
2fe123b852 Merge pull request #102 from webscale-formulas/master
add some missing modules for debian and ubuntu
2016-07-11 09:23:25 -07:00
Niels Abspoel
d7331e5f78 add some missing modules for debian and ubuntu 2016-07-11 13:27:55 +02:00
Forrest
9e577176b2 Merge pull request #101 from aboe76/fix_archlinux
update map.jinja with removed archlinux and fpm support
2016-07-09 14:24:26 -07: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
Forrest
94b8447638 Merge pull request #98 from alinefr/xenial
Add support for Ubuntu Xenial Xerus (16.04). Fixes #97
2016-07-07 16:43:40 -07:00
Aline Freitas
8aaff98176 Add support for Ubuntu Xenial Xerus (16.04). 2016-07-07 20:14:32 -03:00
Forrest
64c0e9bd4e Merge pull request #96 from genuss/gearman
Add php-gearman support
2016-07-07 08:53:47 -07:00
a.genus
4cfc5ba013 Add php-gearman support 2016-07-06 12:31:15 +03:00
Forrest
9d1e553b85 Merge pull request #95 from hackel/patch-1
Add missing default package names for Debian/php7.
2016-07-01 13:26:14 -07: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
Forrest
08dce935dd Merge pull request #94 from kpostrup/master
Added SNMP module for PHP NG
2016-06-28 09:32:54 -07:00
Kenneth Oestrup
d5fb8d3128 Added SNMP module for PHP NG 2016-06-28 11:48:37 +02:00
Forrest
f3aefecd5c Merge pull request #91 from a-powell/master
Adding php 7 map properties.
2016-06-01 19:57:46 -07: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
Wolodja Wentland
bca0a3d624 Merge pull request #89 from fastmarkets/develop
Fix for broken test statement that prevents PPA workaround executing
2016-05-25 17:12:41 +02:00
John Carlyle-Clarke
65e7971a44 Fix for broken test statement that prevents PPA workaround ever executing 2016-05-25 14:50:21 +00:00
Forrest
f8474431a8 Merge pull request #87 from constet/composer-package
Add composer package
2016-05-04 11:47:40 -07:00
Tadas Barzdzius
04fe02d431 Add composer package 2016-05-04 12:49:29 +03:00
Forrest
c57bdb4192 Merge pull request #86 from aboe76/master
add php-zip support on php and php.ng
2016-05-02 13:02:47 -07:00
Niels Abspoel
33ea716515 add php-zip 2016-05-02 21:58:00 +02:00