aboutsummaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp12
1 files changed, 11 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 36c7413..8618042 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,6 +12,7 @@ import "sysctl.pp"
import "ups.pp"
import "utils.pp"
import "database.pp"
+import "websites.pp"
class nodo {
include lsb
@@ -379,7 +380,7 @@ class nodo::master {
include nodo::vserver
include database
include gitosis
- include trac
+ include websites::admin
# TODO:
#include munin::host
@@ -389,6 +390,15 @@ class nodo::master {
alias => ["puppet.$domain"],
}
+ case $puppetmaster_db_password {
+ '': { fail("Please set \$puppetmaster_db_password in your host config") }
+ }
+
+ # update master's puppet.conf if you change here
+ database::instance { "puppet":
+ password => "$puppetmaster_db_password",
+ }
+
backupninja::mysql { "all_databases":
backupdir => '/var/backups/mysql',
compress => true,