From 08cb6f148029b5e9cb74d15c1436376f4517fad9 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Fri, 2 Aug 2013 19:44:37 -0300 Subject: [PATCH] Adding nginx configs to puppet --- puppet/hieradata/common.yaml | 4 ++++ puppet/modules/colab/manifests/init.pp | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index 5e66af3..5e022a1 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -4,3 +4,7 @@ locale::locales: pt_BR pt_BR.UTF-8 en_US en_US.UTF-8 timezone::timezone: America/Sao_Paulo postfix::admin_email: test@test.test + +nginx::worker_processes: 8 +nginx::error_log: '/var/log/nginx/error.log' +nginx::access_log: '/var/log/nginx/access.log' \ No newline at end of file diff --git a/puppet/modules/colab/manifests/init.pp b/puppet/modules/colab/manifests/init.pp index 270ddf6..a1ab349 100644 --- a/puppet/modules/colab/manifests/init.pp +++ b/puppet/modules/colab/manifests/init.pp @@ -8,6 +8,7 @@ class colab { include timezone include postfix + include nginx include supervisor include colab::requirements @@ -42,4 +43,12 @@ class colab { directory => '/home/colab/', user => 'colab', } -} + + nginx::config { 'nginx': + content => template('colab/nginx/extra_conf.erb'), + } + + nginx::site { '000-colab': + content => template('colab/nginx/site_default.erb'), + } +} \ No newline at end of file -- libgit2 0.21.2