From 2bac93263ecda54d916e5b4a8c0eb24b3dd27237 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 7 Jan 2013 10:42:10 -0200 Subject: Adding php.ini for wheezy --- manifests/init.pp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'manifests/init.pp') 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'], } -- cgit v1.2.3