diff options
author | Jesse Luehrs <doy@tozt.net> | 2021-03-14 17:31:55 -0400 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2021-03-14 17:31:55 -0400 |
commit | 91d920c074270c61f9f18e2abf7e5530d57d38f5 (patch) | |
tree | 4e375488ce85765722fbddababc3168ac251e865 /modules/ttrss | |
parent | 6dbd4a1141450883eabe2577b3ef7ee4f1d4c63f (diff) | |
download | puppet-tozt-91d920c074270c61f9f18e2abf7e5530d57d38f5.tar.gz puppet-tozt-91d920c074270c61f9f18e2abf7e5530d57d38f5.zip |
try switching back to normal php
Diffstat (limited to 'modules/ttrss')
-rw-r--r-- | modules/ttrss/files/config.php | 2 | ||||
-rw-r--r-- | modules/ttrss/manifests/init.pp | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/modules/ttrss/files/config.php b/modules/ttrss/files/config.php index 6e88a69..5f1eb51 100644 --- a/modules/ttrss/files/config.php +++ b/modules/ttrss/files/config.php @@ -12,7 +12,7 @@ define('SELF_URL_PATH', 'https://rss.tozt.net/'); define('SINGLE_USER_MODE', false); define('SIMPLE_UPDATE_MODE', false); -define('PHP_EXECUTABLE', '/usr/bin/php7'); +define('PHP_EXECUTABLE', '/usr/bin/php'); define('LOCK_DIRECTORY', 'lock'); define('CACHE_DIR', 'cache'); define('ICONS_DIR', 'feed-icons'); diff --git a/modules/ttrss/manifests/init.pp b/modules/ttrss/manifests/init.pp index 666e45a..aacd5fb 100644 --- a/modules/ttrss/manifests/init.pp +++ b/modules/ttrss/manifests/init.pp @@ -4,8 +4,8 @@ class ttrss { package { [ "tt-rss", - "php7-pgsql", - "php7-fpm", + "php-pgsql", + "php-fpm", ]: ensure => installed; } @@ -49,15 +49,15 @@ class ttrss { exec { "fixup php.ini for pgsql": provider => shell, - command => "sed -i 's/^;\\(extension=.*pgsql\\)$/\\1/' /etc/php7/php.ini", - unless => "grep -q '^extension=pgsql$' /etc/php7/php.ini && grep -q '^extension=pdo_pgsql$' /etc/php7/php.ini", - require => Package["php7-pgsql"]; + command => "sed -i 's/^;\\(extension=.*pgsql\\)$/\\1/' /etc/php/php.ini", + unless => "grep -q '^extension=pgsql$' /etc/php/php.ini && grep -q '^extension=pdo_pgsql$' /etc/php/php.ini", + require => Package["php-pgsql"]; } exec { "fixup php.ini for intl": provider => shell, - command => "sed -i 's/^;\\(extension=intl\\)$/\\1/' /etc/php7/php.ini", - unless => "grep -q '^extension=intl$' /etc/php7/php.ini", + command => "sed -i 's/^;\\(extension=intl\\)$/\\1/' /etc/php/php.ini", + unless => "grep -q '^extension=intl$' /etc/php/php.ini", require => Package["tt-rss"]; } @@ -87,9 +87,9 @@ class ttrss { ] } - service { "php-fpm7": + service { "php-fpm": ensure => running, enable => true, - require => Package["php7-fpm"]; + require => Package["php-fpm"]; } } |