summaryrefslogtreecommitdiffstats
path: root/tozt
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2018-10-27 09:05:52 -0400
committerJesse Luehrs <doy@tozt.net>2018-10-27 09:05:52 -0400
commitbbb827760f1f31aa0ffa90b62dd5f491d4e748c8 (patch)
tree26c07f95e0906e63f38a073942311248ec353451 /tozt
parentb5c51da0fa5be265c7f681225e32821fcf3790fa (diff)
downloadpuppet-tozt-bbb827760f1f31aa0ffa90b62dd5f491d4e748c8.tar.gz
puppet-tozt-bbb827760f1f31aa0ffa90b62dd5f491d4e748c8.zip
fix package name
Diffstat (limited to 'tozt')
-rw-r--r--tozt/ttrss/manifests/init.pp27
1 files changed, 15 insertions, 12 deletions
diff --git a/tozt/ttrss/manifests/init.pp b/tozt/ttrss/manifests/init.pp
index 42722d5..049fd58 100644
--- a/tozt/ttrss/manifests/init.pp
+++ b/tozt/ttrss/manifests/init.pp
@@ -4,7 +4,7 @@ class ttrss($dbpath) {
package {
[
"tt-rss",
- "postgres",
+ "postgresql",
"php-pgsql",
]:
ensure => installed;
@@ -14,12 +14,12 @@ class ttrss($dbpath) {
$dbpath:
owner => 'postgres',
group => 'postgres',
- require => Package["postgres"];
+ require => Package["postgresql"];
"$dbpath/data":
owner => 'postgres',
group => 'postgres',
require => [
- Package["postgres"],
+ Package["postgresql"],
File[$dbpath],
];
"/etc/systemd/system/postgresql.service.d":
@@ -45,12 +45,15 @@ class ttrss($dbpath) {
command => "/usr/bin/initdb -D $dbpath/data",
user => 'postgres',
creates => "$dbpath/data/PG_VERSION",
- require => Package["postgres"];
+ require => Package["postgresql"];
}
- service { "postgres":
+ service { "postgresql":
ensure => running,
- require => Exec["initialize db path"];
+ require => [
+ Package["postgresql"],
+ Exec["initialize db path"],
+ ];
}
exec { "create db user":
@@ -59,8 +62,8 @@ class ttrss($dbpath) {
user => 'postgres',
unless => "psql -Atc 'select usename from pg_catalog.pg_user' | grep -F ttrss",
require => [
- Package["postgres"],
- Service["postgres"],
+ Package["postgresql"],
+ Service["postgresql"],
];
}
@@ -71,8 +74,8 @@ class ttrss($dbpath) {
unless => "psql -Atc 'select datname from pg_catalog.pg_database' | grep -F ttrss",
require => [
Exec["create db user"],
- Package["postgres"],
- Service["postgres"],
+ Package["postgresql"],
+ Service["postgresql"],
];
}
@@ -89,8 +92,8 @@ class ttrss($dbpath) {
user => 'postgres',
unless => "psql -d ttrss -Atc 'select relname from pg_catalog.pg_class;' | grep -q '^ttrss'",
require => [
- Package["postgres"],
- Service["postgres"],
+ Package["postgresql"],
+ Service["postgresql"],
Exec["create db"],
Package["tt-rss"],
File["/etc/webapps/tt-rss/config.php"],