Store youri-check results in pgsql, and generate the reports from there on alamut

2 files changed, 57 insertions, 37 deletions

diff --git a/modules/youri-check/manifests/init.pp b/modules/youri-check/manifests/init.pp
index 02c7b91a..b1b2ea1f 100644
--- a/modules/youri-check/manifests/init.pp
+++ b/modules/youri-check/manifests/init.pp
@@ -1,49 +1,67 @@
 class youri-check {
-    class variable {
-        $location = "/var/www/youri-check"
+    class base {
         $vhost = "check.$domain"
-    }
+        $user = 'youri'
+        $config = '/etc/youri/cauldron.conf'
+        $outdir = '/var/www/youri-check'
+        $home = '/var/tmp/youri'
 
-    class check inherits variable {
-	$user = 'youri'
-	$home = '/var/tmp/youri'
-	$outdir = "$home/www"
-	$config = "/etc/youri/cauldron.conf"
+        user { $user:
+            comment => 'Youri Check',
+            ensure => present,
+            managehome => true,
+            home => $home,
+        }
 
-	user { $user:
-	    comment => "Youri Check",
-	    ensure => present,
-	    managehome => true,
-	    home => $home,
+        $pgsql_server = "$vhost"
+        $pgsql_db = 'youri_check'
+        $pgsql_user = 'youri'
+        $pgsql_password = extlookup('youri_pgsql','x')
+        postgresql::remote_user { $pgsql_user:
+            password => $pgsql_password,
         }
 
-	package { ['perl-Youri-Media', 'youri-check', 'perl-DBD-SQLite'] :
+    }
+
+    class check inherits base {
+        package { ['perl-Youri-Media', 'youri-check', 'perl-DBD-Pg'] :
             ensure => installed
-	}
-
-	cron { 'check':
-	    command => "youri-check -c $config test && youri-check -c $config report",
-	    hour => 6,
-	    user => "$user",
-	}
-
-	file { "$config":
-	    ensure => present,
-	    owner => $user,
-	    mode => 640,
-	    content => template("youri-check/check.conf"),
-	}
+        }
+
+        cron { 'check':
+            command => "youri-check -c $config test",
+            hour => [0, 6, 12, 18]
+            minute => 4
+            user => "$user",
+        }
+
+        file { "$config":
+            ensure => present,
+            owner => $user,
+            mode => 640,
+            content => template("youri-check/check.conf"),
+        }
     }
 
-    class website inherits variable {
-	file { "$location":
-	    ensure => directory,
+    class report inherits base {
+        file { "$outdir":
+            ensure => directory,
             owner => apache,
-	    mode => 755
-	}
+            mode => 755
+        }
+
+        package { ['youri-check', 'perl-DBD-Pg'] :
+            ensure => installed
+        }
+
+        cron { 'check':
+            command => "youri-check -c $config report",
+            hour => [1, 7, 13, 19]
+            user => "$user",
+        }
 
         apache::vhost_simple { $vhost:
-            location => $location,
+            location => $outdir,
         }
     }
 }
diff --git a/modules/youri-check/templates/check.conf b/modules/youri-check/templates/check.conf
index be89b065..a57460df 100644
--- a/modules/youri-check/templates/check.conf
+++ b/modules/youri-check/templates/check.conf
@@ -9,9 +9,11 @@ mirror_x86_64: ${mirror}/x86_64/media
 resultset:
     class: Youri::Check::Resultset::DBI
     options:
-        driver: SQLite
-        host: localhost
-        base: youri.db
+        driver: Pg
+        host: <%= pgsql_server %>
+        base: <%= pgsql_db %>
+        user: <%= pgsql_user %>
+        password: <%= pgsql_password %>
 
 # checks definitions
 tests: