diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-02-07 15:35:34 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-02-07 15:35:34 -0200 |
| commit | 3994db56dd89d90e216712491956bb2b22382ff8 (patch) | |
| tree | 612066761cc24c04320bb18fcca2106a224fa37e /manifests/init.pp | |
| parent | 6a5a4ca4c9ab0eae983bbab0a4e4cf10653da76e (diff) | |
| download | puppet-nodo-3994db56dd89d90e216712491956bb2b22382ff8.tar.gz puppet-nodo-3994db56dd89d90e216712491956bb2b22382ff8.tar.bz2 | |
Adding websites' classes and enhancing nodo::master
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 12 |
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, |