aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-07 10:42:10 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-07 10:42:10 -0200
commit2bac93263ecda54d916e5b4a8c0eb24b3dd27237 (patch)
tree59078d9915683dcb26565ebf43a6b78017cbd532 /manifests
parente623638680c24010a063636c006e1976e723e8ae (diff)
downloadpuppet-php-2bac93263ecda54d916e5b4a8c0eb24b3dd27237.tar.gz
puppet-php-2bac93263ecda54d916e5b4a8c0eb24b3dd27237.tar.bz2
Adding php.ini for wheezy
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp16
1 files changed, 10 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 8d35c00..fe383ed 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -34,9 +34,11 @@ class php {
owner => root,
group => root,
mode => 0644,
- source => [ "puppet://$server/modules/site-php/cli/$fqdn/php.ini",
- "puppet://$server/modules/site-php/cli/$domain/php.ini",
- "puppet://$server/modules/php/cli/php.ini" ],
+ source => [ "puppet:///modules/site-php/cli/$fqdn/php.ini",
+ "puppet:///modules/site-php/cli/$domain/php.ini",
+ "puppet:///modules/php/cli/php.${operatingsystem}_${lsbdistcodename}.ini",
+ "puppet:///modules/php/cli/php.${operatingsystem}.ini",
+ "puppet:///modules/php/cli/php.ini" ],
require => Package['php5-cli'],
}
@@ -45,9 +47,11 @@ class php {
owner => root,
group => root,
mode => 0644,
- source => [ "puppet://$server/modules/site-php/apache2/$fqdn/php.ini",
- "puppet://$server/modules/site-php/apache2/$domain/php.ini",
- "puppet://$server/modules/php/apache2/php.ini" ],
+ source => [ "puppet:///modules/site-php/apache2/$fqdn/php.ini",
+ "puppet:///modules/site-php/apache2/$domain/php.ini",
+ "puppet:///modules/php/cli/php.${operatingsystem}_${lsbdistcodename}.ini",
+ "puppet:///modules/php/cli/php.${operatingsystem}.ini",
+ "puppet:///modules/php/apache2/php.ini" ],
notify => Service['apache2'],
require => Package['php5'],
}