Commit 08cb6f148029b5e9cb74d15c1436376f4517fad9
1 parent
8640ea56
Exists in
master
and in
39 other branches
Adding nginx configs to puppet
Showing
2 changed files
with
14 additions
and
1 deletions
Show diff stats
puppet/hieradata/common.yaml
... | ... | @@ -4,3 +4,7 @@ locale::locales: pt_BR pt_BR.UTF-8 en_US en_US.UTF-8 |
4 | 4 | timezone::timezone: America/Sao_Paulo |
5 | 5 | |
6 | 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 | 11 | \ No newline at end of file | ... | ... |
puppet/modules/colab/manifests/init.pp
... | ... | @@ -8,6 +8,7 @@ class colab { |
8 | 8 | include timezone |
9 | 9 | include postfix |
10 | 10 | |
11 | + include nginx | |
11 | 12 | include supervisor |
12 | 13 | include colab::requirements |
13 | 14 | |
... | ... | @@ -42,4 +43,12 @@ class colab { |
42 | 43 | directory => '/home/colab/', |
43 | 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 | 55 | \ No newline at end of file | ... | ... |