separate out postgres installation

4 files changed, 53 insertions, 43 deletions

diff --git a/modules/postgres/manifests/init.pp b/modules/postgres/manifests/init.pp
new file mode 100644
index 0000000..3ac9887
--- /dev/null
+++ b/modules/postgres/manifests/init.pp
@@ -0,0 +1,50 @@
+class postgres {
+  include systemd
+
+  $dbpath = "${persistent_data}/postgres" # lint:ignore:variable_scope
+
+  package { "postgresql":
+      ensure => installed;
+  }
+
+  file {
+    $dbpath:
+      ensure => directory,
+      owner => 'postgres',
+      group => 'postgres',
+      require => Package["postgresql"];
+    "$dbpath/data":
+      ensure => directory,
+      owner => 'postgres',
+      group => 'postgres',
+      require => [
+        Package["postgresql"],
+        File[$dbpath],
+      ];
+    "/etc/systemd/system/postgresql.service.d":
+      ensure => directory;
+    "/etc/systemd/system/postgresql.service.d/override.conf":
+      content => template('postgres/postgres-service'),
+      notify => Exec["/usr/bin/systemctl daemon-reload"],
+      require => File["/etc/systemd/system/postgresql.service.d"];
+  }
+
+  exec { "initialize db path":
+    command => "/usr/bin/initdb -D $dbpath/data",
+    user => 'postgres',
+    creates => "$dbpath/data/PG_VERSION",
+    require => [
+      File["$dbpath/data"],
+      Package["postgresql"],
+    ];
+  }
+
+  service { "postgresql":
+    ensure => running,
+    enable => true,
+    require => [
+      Package["postgresql"],
+      Exec["initialize db path"],
+    ];
+  }
+}
diff --git a/modules/ttrss/templates/postgres-service b/modules/postgres/templates/postgres-service
index aa63550..aa63550 100644
--- a/modules/ttrss/templates/postgres-service
+++ b/modules/postgres/templates/postgres-service
diff --git a/modules/tozt/manifests/ttrss.pp b/modules/tozt/manifests/ttrss.pp
index 3b25ec3..338b4ea 100644
--- a/modules/tozt/manifests/ttrss.pp
+++ b/modules/tozt/manifests/ttrss.pp
@@ -3,7 +3,6 @@ class tozt::ttrss {
   include tozt::persistent
 
   class { "ttrss":
-    dbpath => "/media/persistent/ttrss",
     require => Class["tozt::persistent"];
   }
 
diff --git a/modules/ttrss/manifests/init.pp b/modules/ttrss/manifests/init.pp
index e7c9d2f..26767c9 100644
--- a/modules/ttrss/manifests/init.pp
+++ b/modules/ttrss/manifests/init.pp
@@ -1,10 +1,9 @@
-class ttrss($dbpath) {
-  include systemd
+class ttrss {
+  include postgres;
 
   package {
     [
       "tt-rss",
-      "postgresql",
       "php-pgsql",
       "php-fpm",
     ]:
@@ -12,25 +11,6 @@ class ttrss($dbpath) {
   }
 
   file {
-    $dbpath:
-      ensure => directory,
-      owner => 'postgres',
-      group => 'postgres',
-      require => Package["postgresql"];
-    "$dbpath/data":
-      ensure => directory,
-      owner => 'postgres',
-      group => 'postgres',
-      require => [
-        Package["postgresql"],
-        File[$dbpath],
-      ];
-    "/etc/systemd/system/postgresql.service.d":
-      ensure => directory;
-    "/etc/systemd/system/postgresql.service.d/override.conf":
-      content => template('ttrss/postgres-service'),
-      notify => Exec["/usr/bin/systemctl daemon-reload"],
-      require => File["/etc/systemd/system/postgresql.service.d"];
     "/etc/webapps/tt-rss/config.php":
       source => "puppet:///modules/ttrss/config.php",
       require => Package["tt-rss"];
@@ -41,26 +21,7 @@ class ttrss($dbpath) {
       require => [
         File["/etc/pacman.d/hooks"],
         Package["tt-rss"],
-      ]
-  }
-
-  exec { "initialize db path":
-    command => "/usr/bin/initdb -D $dbpath/data",
-    user => 'postgres',
-    creates => "$dbpath/data/PG_VERSION",
-    require => [
-      File["$dbpath/data"],
-      Package["postgresql"],
-    ];
-  }
-
-  service { "postgresql":
-    ensure => running,
-    enable => true,
-    require => [
-      Package["postgresql"],
-      Exec["initialize db path"],
-    ];
+      ];
   }
 
   exec { "create db user":