Merge changes I3d69d1c6,I8b0fa62a,I668a5e8d,Iaf0e30fa

[infra.git] / environments / production / manifests / nginx.pp

diff --git a/environments/production/manifests/nginx.pp b/environments/production/manifests/nginx.pp
index baea15d0839a29b4d67da48ab75b051ade51b924..db81cc5177f00fec1db11c766e6c856856956e5d 100644 (file)
--- a/environments/production/manifests/nginx.pp
+++ b/environments/production/manifests/nginx.pp
@@ -1,4 +1,4 @@
-define front_vhost($source, $crt = undefined){
+define front_vhost($source, $crt = undefined, $args = {}){
   if $crt {
     file{"/etc/ssl/private/$name.crt":
       ensure => 'file',
@@ -16,7 +16,7 @@ define front_vhost($source, $crt = undefined){
   }
   file {"/etc/nginx/sites-available/$name.conf":
     ensure => 'file',
-    content => epp($source),
+    content => epp($source, $args),
     require => Package['nginx-light'],
   }->
   file {"/etc/nginx/sites-enabled/$name.conf":
@@ -91,4 +91,7 @@ node front-nginx {
     notify => Service['nginx'],
     crt => 'gitweb/web'
   }
+
+  Front_vhost <| tag == nginx |> ~> Service['nginx']
+  File <| tag == nginx |> ~> Service['nginx']
 }