Fix php package name and php.ini path for PHP 7.0

This commit is contained in:
Keith Whyte 2018-02-22 13:34:32 +00:00
parent f58f6f68aa
commit 315bd8fb3f
2 changed files with 1923 additions and 6 deletions

File diff suppressed because it is too large Load diff

View file

@ -56,17 +56,16 @@ class rhizo_base::packages::ubuntu inherits rhizo_base::packages::common {
class rhizo_base::packages::debian inherits rhizo_base::packages::common { class rhizo_base::packages::debian inherits rhizo_base::packages::common {
package { ['apache2','libapache2-mod-php5', 'php5', 'php5-pgsql', package { ['apache2','libapache2-mod-php', 'php', 'php-pgsql',
'php5-curl', 'php5-cli', 'php5-gd', 'php-curl', 'php-cli', 'php-gd',
'sudo', 'apt-transport-https']: 'sudo', 'apt-transport-https']:
ensure => installed, ensure => installed,
require => Class['rhizo_base::apt'], require => Class['rhizo_base::apt'],
} }
file { '/etc/php5/apache2/php.ini': file { '/etc/php/7.0/apache2/php.ini':
ensure => present, ensure => present,
source => "puppet:///modules/rhizo_base/etc/php5/apache2/php.ini.$operatingsystem" source => "puppet:///modules/rhizo_base/php.ini"
} }
}
}