From 6268701cd5e7d0575376eb43ff3e6a27c06bd4dd Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Fri, 8 Aug 2014 12:05:38 -0300 Subject: [PATCH] Using hiera to set postgresql globals --- puppet/hieradata/common.yaml | 3 +++ puppet/modules/colab/manifests/init.pp | 7 +------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index b8600d4..658a0d8 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -7,6 +7,9 @@ timezone::timezone: America/Sao_Paulo postfix::admin_email: test@test.test +postgresql::globals::version: '9.3' +postgresql::globals::manage_package_repo: 'true' + nginx::worker_processes: 8 nginx::error_log: '/var/log/nginx/error.log' nginx::access_log: '/var/log/nginx/access.log' diff --git a/puppet/modules/colab/manifests/init.pp b/puppet/modules/colab/manifests/init.pp index e66e0b8..fe0c1cf 100644 --- a/puppet/modules/colab/manifests/init.pp +++ b/puppet/modules/colab/manifests/init.pp @@ -16,14 +16,9 @@ class colab ( include appdeploy::deps::lxml include appdeploy::deps::postgresql include colab::cronjobs + include postgresql::globals include postgresql::server - class { 'postgresql::globals': - manage_package_repo => true, - version => '9.3', - before => Class['postgresql::server'], - } - postgresql::server::db { 'colab': user => 'colab', password => 'colab', -- libgit2 0.21.2