diff options
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 16 |
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'], } |