Download as
Browse Code »

Commit 6268701cd5e7d0575376eb43ff3e6a27c06bd4dd

Authored by Sergio Oliveira
1 parent 74ccc42d
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Using hiera to set postgresql globals

Showing 2 changed files with 4 additions and 6 deletions   Show diff stats
puppet/hieradata/common.yaml
  Diff comments   View file @6268701
@@ -7,6 +7,9 @@ timezone::timezone: America/Sao_Paulo @@ -7,6 +7,9 @@ timezone::timezone: America/Sao_Paulo
7 7
8 postfix::admin_email: test@test.test 8 postfix::admin_email: test@test.test
9 9
  10 +postgresql::globals::version: '9.3'
  11 +postgresql::globals::manage_package_repo: 'true'
  12 +
10 nginx::worker_processes: 8 13 nginx::worker_processes: 8
11 nginx::error_log: '/var/log/nginx/error.log' 14 nginx::error_log: '/var/log/nginx/error.log'
12 nginx::access_log: '/var/log/nginx/access.log' 15 nginx::access_log: '/var/log/nginx/access.log'
puppet/modules/colab/manifests/init.pp
  Diff comments   View file @6268701
@@ -16,14 +16,9 @@ class colab ( @@ -16,14 +16,9 @@ class colab (
16 include appdeploy::deps::lxml 16 include appdeploy::deps::lxml
17 include appdeploy::deps::postgresql 17 include appdeploy::deps::postgresql
18 include colab::cronjobs 18 include colab::cronjobs
  19 + include postgresql::globals
19 include postgresql::server 20 include postgresql::server
20 21
21 - class { 'postgresql::globals':  
22 - manage_package_repo => true,  
23 - version => '9.3',  
24 - before => Class['postgresql::server'],  
25 - }  
26 -  
27 postgresql::server::db { 'colab': 22 postgresql::server::db { 'colab':
28 user => 'colab', 23 user => 'colab',
29 password => 'colab', 24 password => 'colab',