keith/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix path for php.ini on Ubuntu

Browse source
This commit is contained in:
Wile E. Coyote 2017-01-24 21:25:15 +00:00
parent b353f4410b
commit bea5f9554e
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/rhizo_base/manifests/packages.pp
View file

@ -23,10 +23,6 @@ class rhizo_base::packages::common {
require => Class['rhizo_base::apt'],
}
file { '/etc/php5/apache2/php.ini':
ensure => present,
source => "puppet:///modules/rhizo_base/etc/php5/apache2/php.ini.$operatingsystem"
}
}
@ -48,10 +44,16 @@ class rhizo_base::packages::ubuntu inherits rhizo_base::packages::common {
require => Class['rhizo_base::apt'],
}
file { '/etc/php/5.6/apache2/php.ini':
ensure => present,
source => "puppet:///modules/rhizo_base/etc/php5/apache2/php.ini.$operatingsystem"
}
}
class rhizo_base::packages::debian inherits rhizo_base::packages::common {
package { ['apache2','libapache2-mod-php5',
'rrdtool', 'python-psycopg2',
'python-pysqlite2', 'php5', 'php5-pgsql',
@ -61,4 +63,11 @@ class rhizo_base::packages::debian inherits rhizo_base::packages::common {
ensure => installed,
require => Class['rhizo_base::apt'],
}
file { '/etc/php5/apache2/php.ini':
ensure => present,
source => "puppet:///modules/rhizo_base/etc/php5/apache2/php.ini.$operatingsystem"
}
}