diff options
| -rw-r--r-- | manifests/nodes/alamut.pp | 1 | ||||
| -rw-r--r-- | modules/epoll/manifests/create_db.pp | 7 | ||||
| -rw-r--r-- | modules/epoll/manifests/init.pp | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/manifests/nodes/alamut.pp b/manifests/nodes/alamut.pp index 63618c0c..3fdd7eaf 100644 --- a/manifests/nodes/alamut.pp +++ b/manifests/nodes/alamut.pp @@ -21,6 +21,7 @@ node alamut { db_password => extlookup('epoll_pgsql','x'), } include epoll + include epoll::create_db include transifex include bugzilla diff --git a/modules/epoll/manifests/create_db.pp b/modules/epoll/manifests/create_db.pp new file mode 100644 index 00000000..8ef9c0aa --- /dev/null +++ b/modules/epoll/manifests/create_db.pp @@ -0,0 +1,7 @@ +class epoll::create_db () { + postgresql::remote_db_and_user { $epoll::var::db_name: + description => 'Epoll database', + password => $epoll::var::db_password, + } +} +# vim: sw=2 diff --git a/modules/epoll/manifests/init.pp b/modules/epoll/manifests/init.pp index 509a389c..fb86f23a 100644 --- a/modules/epoll/manifests/init.pp +++ b/modules/epoll/manifests/init.pp @@ -11,11 +11,6 @@ class epoll { apache::vhost::redirect_ssl { $epoll::var::vhost: } - postgresql::remote_db_and_user { $epoll::var::db_name: - description => 'Epoll database', - password => $epoll::var::db_password, - } - file { 'epoll.yml': path => '/etc/epoll.yml', group => 'apache', |