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

PHP config differs between buster/stretch

Browse source
This commit is contained in:
Keith Whyte 2020-04-17 05:38:33 +02:00
parent 006b062aaa
commit cff9299520
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,6 +51,8 @@ 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 {
include stdlib
package { ['apache2','libapache2-mod-php', 'php', 'php-pgsql', package { ['apache2','libapache2-mod-php', 'php', 'php-pgsql',
'php-curl', 'php-cli', 'php-gd', 'php-intl', 'php-gettext', 'php-curl', 'php-cli', 'php-gd', 'php-intl', 'php-gettext',
'sudo']: 'sudo']:
@ -58,10 +60,23 @@ class rhizo_base::packages::debian inherits rhizo_base::packages::common {
require => Class['rhizo_base::apt'], require => Class['rhizo_base::apt'],
} }
file { '/etc/php/7.0/apache2/php.ini':
ensure => present, if ($lsbdistcodename == 'buster') {
source => "puppet:///modules/rhizo_base/php.ini", # FIXME: An Apache restart is required after this change.
require => Package['libapache2-mod-php'] file_line { 'apache_php':
ensure => present,
path => '/etc/php/7.3/apache2/php.ini',
line => 'short_open_tag = On',
match => '^short_open_tag',
append_on_no_match => false,
} }
} else {
file { '/etc/php/7.0/apache2/php.ini':
ensure => present,
source => "puppet:///modules/rhizo_base/php.ini",
require => Package['libapache2-mod-php']
}
}
} }