4 files changed, 6 insertions, 6 deletions
diff --git a/modules/buildsystem/templates/maintdb b/modules/buildsystem/templates/maintdb
index a6fa3ba8..b0cfb1ef 100755
--- a/modules/buildsystem/templates/maintdb
+++ b/modules/buildsystem/templates/maintdb
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAINTDBDIR="<%= maintdb_dbdir %>"
+MAINTDBDIR="<%= dbdir %>"
 
 function checkname()
 {
diff --git a/modules/buildsystem/templates/sudoers.maintdb b/modules/buildsystem/templates/sudoers.maintdb
index 7503eae4..8dd19c42 100644
--- a/modules/buildsystem/templates/sudoers.maintdb
+++ b/modules/buildsystem/templates/sudoers.maintdb
@@ -1,2 +1,2 @@
-%<%= scope.lookupvar('buildsystem::base::packagers_group') %>      ALL =(<%= maintdb_login %>) NOPASSWD: <%= maintdb_binpath %>
-<%=  scope.lookupvar('buildsystem::base::sched_login') %>	ALL =(<%= maintdb_login %>) NOPASSWD: <%= maintdb_binpath %>
+%<%= scope.lookupvar('buildsystem::base::packagers_group') %>      ALL =(<%= login %>) NOPASSWD: <%= binpath %>
+<%=  scope.lookupvar('buildsystem::base::sched_login') %>	ALL =(<%= login %>) NOPASSWD: <%= binpath %>
diff --git a/modules/buildsystem/templates/vhost_maintdb.conf b/modules/buildsystem/templates/vhost_maintdb.conf
index 0990ebfd..225c7215 100644
--- a/modules/buildsystem/templates/vhost_maintdb.conf
+++ b/modules/buildsystem/templates/vhost_maintdb.conf
@@ -1,3 +1,3 @@
-<Directory <%= maintdb_dbdir %>>
+<Directory <%= dbdir %>>
   Options None
 </Directory>
diff --git a/modules/buildsystem/templates/wrapper.maintdb b/modules/buildsystem/templates/wrapper.maintdb
index a1ebf1f0..8420022d 100644
--- a/modules/buildsystem/templates/wrapper.maintdb
+++ b/modules/buildsystem/templates/wrapper.maintdb
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-maintdbuser="<%= maintdb_login %>"
-maintdbpath="<%= maintdb_binpath %>"
+maintdbuser="<%= login %>"
+maintdbpath="<%= binpath %>"
 packagersgroup="<%= scope.lookupvar('buildsystem::base::packagers_group') %>"
 
 function isingroup()