Download as
Browse Code »

Commit 08cb6f148029b5e9cb74d15c1436376f4517fad9

Authored by Sergio Oliveira
1 parent 8640ea56
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

Adding nginx configs to puppet

Showing 2 changed files with 14 additions and 1 deletions   Show diff stats
puppet/hieradata/common.yaml
  Diff comments   View file @08cb6f1
@@ -4,3 +4,7 @@ locale::locales: pt_BR pt_BR.UTF-8 en_US en_US.UTF-8 @@ -4,3 +4,7 @@ locale::locales: pt_BR pt_BR.UTF-8 en_US en_US.UTF-8
4 timezone::timezone: America/Sao_Paulo 4 timezone::timezone: America/Sao_Paulo
5 5
6 postfix::admin_email: test@test.test 6 postfix::admin_email: test@test.test
  7 +
  8 +nginx::worker_processes: 8
  9 +nginx::error_log: '/var/log/nginx/error.log'
  10 +nginx::access_log: '/var/log/nginx/access.log'
7 \ No newline at end of file 11 \ No newline at end of file
puppet/modules/colab/manifests/init.pp
  Diff comments   View file @08cb6f1
@@ -8,6 +8,7 @@ class colab { @@ -8,6 +8,7 @@ class colab {
8 include timezone 8 include timezone
9 include postfix 9 include postfix
10 10
  11 + include nginx
11 include supervisor 12 include supervisor
12 include colab::requirements 13 include colab::requirements
13 14
@@ -42,4 +43,12 @@ class colab { @@ -42,4 +43,12 @@ class colab {
42 directory => '/home/colab/', 43 directory => '/home/colab/',
43 user => 'colab', 44 user => 'colab',
44 } 45 }
45 -} 46 +
  47 + nginx::config { 'nginx':
  48 + content => template('colab/nginx/extra_conf.erb'),
  49 + }
  50 +
  51 + nginx::site { '000-colab':
  52 + content => template('colab/nginx/site_default.erb'),
  53 + }
  54 +}
46 \ No newline at end of file 55 \ No newline at end of file