Add buildsystem::var::maintdb

buildsystem::var::maintdb is used to store maintdb configuration.

6 files changed, 34 insertions, 27 deletions

diff --git a/modules/buildsystem/manifests/maintdb.pp b/modules/buildsystem/manifests/maintdb.pp
index f2765a40..c9593b56 100644
--- a/modules/buildsystem/manifests/maintdb.pp
+++ b/modules/buildsystem/manifests/maintdb.pp
@@ -1,28 +1,23 @@
 class buildsystem::maintdb {
+    include buildsystem::var::maintdb
     include buildsystem::var::groups
     include buildsystem::var::webstatus
     include sudo
-    $login = 'maintdb'
-    $homedir = '/var/lib/maintdb'
-    $dbdir = "$homedir/db"
-    $binpath = '/usr/local/sbin/maintdb'
-    $dump = "${buildsystem::var::webstatus::location}/data/maintdb.txt"
-    $unmaintained = "${buildsystem::var::webstatus::location}/data/unmaintained.txt"
-
-    user { $login:
+
+    user { $buildsystem::var::maintdb::login:
         comment => 'Maintainers database',
-        home    => $homedir,
+        home    => $buildsystem::var::maintdb::homedir,
     }
 
-    file { [$homedir,$dbdir]:
+    file { [$buildsystem::var::maintdb::homedir,$buildsystem::var::maintdb::dbdir]:
         ensure  => directory,
-        owner   => $login,
-        group   => $login,
+        owner   => $buildsystem::var::maintdb::login,
+        group   => $buildsystem::var::maintdb::login,
         mode    => '0711',
-        require => User[$login],
+        require => User[$buildsystem::var::maintdb::login],
     }
 
-    file { $binpath:
+    file { $buildsystem::var::maintdb::binpath:
         mode    => '0755',
         content => template('buildsystem/maintdb/maintdb.bin')
     }
@@ -35,21 +30,23 @@ class buildsystem::maintdb {
         content => template('buildsystem/maintdb/sudoers.maintdb')
     }
 
-    file { [$dump,"$dump.new",
-            $unmaintained,"$unmaintained.new"]:
-        owner   => $login,
+    file { [$buildsystem::var::maintdb::dump,
+            "${buildsystem::var::maintdb::dump}.new",
+            $buildsystem::var::maintdb::unmaintained,
+	    "${buildsystem::var::maintdb::unmaintained}.new"]:
+        owner   => $buildsystem::var::maintdb::login,
         require => File["${buildsystem::var::webstatus::location}/data"],
     }
 
     cron { 'update maintdb export':
-        user    => $login,
-        command => "$binpath root get > $dump.new; cp -f $dump.new $dump; grep ' nobody\$' $dump | sed 's/ nobody\$//' > $unmaintained.new; cp -f $unmaintained.new $unmaintained",
+        user    => $buildsystem::var::maintdb::login,
+        command => "${buildsystem::var::maintdb::binpath} root get > ${buildsystem::var::maintdb::dump}.new; cp -f ${buildsystem::var::maintdb::dump}.new ${buildsystem::var::maintdb::dump}; grep ' nobody\$' ${buildsystem::var::maintdb::dump} | sed 's/ nobody\$//' > ${buildsystem::var::maintdb::unmaintained}.new; cp -f ${buildsystem::var::maintdb::unmaintained}.new ${buildsystem::var::maintdb::unmaintained}",
         minute  => '*/30',
-        require => User[$login],
+        require => User[$buildsystem::var::maintdb::login],
     }
 
     apache::vhost::base { "maintdb.$::domain":
-        location => $dbdir,
+        location => $buildsystem::var::maintdb::dbdir,
         content  => template('buildsystem/maintdb/vhost_maintdb.conf'),
     }
 }
diff --git a/modules/buildsystem/manifests/var/maintdb.pp b/modules/buildsystem/manifests/var/maintdb.pp
new file mode 100644
index 00000000..cb8466a5
--- /dev/null
+++ b/modules/buildsystem/manifests/var/maintdb.pp
@@ -0,0 +1,10 @@
+class buildsystem::var::maintdb(
+    $login = 'maintdb',
+    $homedir = '/var/lib/maintdb'
+) {
+    include buildsystem::var::webstatus
+    $dbdir = "$homedir/db"
+    $binpath = '/usr/local/sbin/maintdb'
+    $dump = "${buildsystem::var::webstatus::location}/data/maintdb.txt"
+    $unmaintained = "${buildsystem::var::webstatus::location}/data/unmaintained.txt"
+}
diff --git a/modules/buildsystem/templates/maintdb/maintdb.bin b/modules/buildsystem/templates/maintdb/maintdb.bin
index b0cfb1ef..eb18ffef 100755
--- a/modules/buildsystem/templates/maintdb/maintdb.bin
+++ b/modules/buildsystem/templates/maintdb/maintdb.bin
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAINTDBDIR="<%= dbdir %>"
+MAINTDBDIR="<%= scope.lookupvar('buildsystem::var::maintdb::dbdir') %>"
 
 function checkname()
 {
diff --git a/modules/buildsystem/templates/maintdb/sudoers.maintdb b/modules/buildsystem/templates/maintdb/sudoers.maintdb
index 6e826830..4f919a0c 100644
--- a/modules/buildsystem/templates/maintdb/sudoers.maintdb
+++ b/modules/buildsystem/templates/maintdb/sudoers.maintdb
@@ -1,2 +1,2 @@
-%<%= scope.lookupvar('buildsystem::var::groups::packagers') %>      ALL =(<%= login %>) NOPASSWD: <%= binpath %>
-<%=  scope.lookupvar('buildsystem::var::scheduler::login') %>	ALL =(<%= login %>) NOPASSWD: <%= binpath %>
+%<%= scope.lookupvar('buildsystem::var::groups::packagers') %>      ALL =(<%= scope.lookupvar('buildsystem::var::maintdb::login') %>) NOPASSWD: <%= scope.lookupvar('buildsystem::var::maintdb::binpath') %>
+<%=  scope.lookupvar('buildsystem::var::scheduler::login') %>	ALL =(<%= scope.lookupvar('buildsystem::var::maintdb::login') %>) NOPASSWD: <%= scope.lookupvar('buildsystem::var::maintdb::binpath') %>
diff --git a/modules/buildsystem/templates/maintdb/vhost_maintdb.conf b/modules/buildsystem/templates/maintdb/vhost_maintdb.conf
index 225c7215..146413a7 100644
--- a/modules/buildsystem/templates/maintdb/vhost_maintdb.conf
+++ b/modules/buildsystem/templates/maintdb/vhost_maintdb.conf
@@ -1,3 +1,3 @@
-<Directory <%= dbdir %>>
+<Directory <%= scope.lookupvar('buildsystem::var::maintdb::dbdir') %>>
   Options None
 </Directory>
diff --git a/modules/buildsystem/templates/maintdb/wrapper.maintdb b/modules/buildsystem/templates/maintdb/wrapper.maintdb
index b3914806..2adddd1e 100644
--- a/modules/buildsystem/templates/maintdb/wrapper.maintdb
+++ b/modules/buildsystem/templates/maintdb/wrapper.maintdb
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-maintdbuser="<%= login %>"
-maintdbpath="<%= binpath %>"
+maintdbuser="<%= scope.lookupvar('buildsystem::var::maintdb::login') %>"
+maintdbpath="<%= scope.lookupvar('buildsystem::var::maintdb::binpath') %>"
 packagersgroup="<%= scope.lookupvar('buildsystem::var::groups::packagers') %>"
 
 function isingroup()