summaryrefslogtreecommitdiffstats
path: root/modules/ttrss
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2019-08-24 00:02:04 -0400
committerJesse Luehrs <doy@tozt.net>2019-08-24 00:02:04 -0400
commitddd76b6cee8dd4dba665e75248720b4d20b061e2 (patch)
tree279e6fb67802d3b3093b59bc8b61b95f406acc3d /modules/ttrss
parent15e5423c3f68af89e37b40971206cd239a50d11e (diff)
downloadpuppet-tozt-ddd76b6cee8dd4dba665e75248720b4d20b061e2.tar.gz
puppet-tozt-ddd76b6cee8dd4dba665e75248720b4d20b061e2.zip
ttrss also needs the intl php module now
Diffstat (limited to 'modules/ttrss')
-rw-r--r--modules/ttrss/manifests/init.pp12
1 files changed, 10 insertions, 2 deletions
diff --git a/modules/ttrss/manifests/init.pp b/modules/ttrss/manifests/init.pp
index 0c40dda..ee1ddeb 100644
--- a/modules/ttrss/manifests/init.pp
+++ b/modules/ttrss/manifests/init.pp
@@ -47,13 +47,20 @@ class ttrss {
];
}
- exec { "fixup php.ini":
+ exec { "fixup php.ini for pgsql":
provider => shell,
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/php/php.ini",
+ unless => "grep -q '^extension=intl$' /etc/php/php.ini",
+ require => Package["ttrss"];
+ }
+
exec { "initialize tt-rss db":
provider => shell,
command => "psql ttrss -U ttrss -f /usr/share/webapps/tt-rss/schema/ttrss_schema_pgsql.sql",
@@ -73,7 +80,8 @@ class ttrss {
enable => true,
require => [
Package["tt-rss"],
- Exec["fixup php.ini"],
+ Exec["fixup php.ini for pgsql"],
+ Exec["fixup php.ini for intl"],
File["/etc/webapps/tt-rss/config.php"],
Exec["create ttrss db"],
]