#1203 - Establish nginx::hostconfig-fragment() directive

modules/trac/manifests/init.pp

Index: modules/trac/manifests/init.pp
===================================================================
--- a/modules/trac/manifests/init.pp
+++ b/modules/trac/manifests/init.pp
@@ -2,7 +2,6 @@
     $domain,
     $certificate,
     $private_key,
-    $fcgi_config_dir = '/etc/nginx/trac.d',
     $is_default = false) inherits private::trac {
 
   package {['python-mysqldb','python-pip','subversion', 'tofrodos', 'graphviz']:
@@ -11,20 +10,11 @@
 
   include nginx, spawn-fcgi
 
-  file {$fcgi_config_dir:
-    ensure => directory,
-    owner => 'root',
-    mode => 755,
-    require => Package['nginx'],
-  }
-
   nginx::hostconfig {$domain:
-    content => "include $fcgi_config_dir/*;",
     is_default => $is_default,
     certificate => $certificate,
     private_key => $private_key,
     log => 'access_log_trac',
-    require => File[$fcgi_config_dir],
   }
 
   user {'trac':
@@ -151,13 +141,9 @@
 
     $location_base = regsubst($location, '/+$', '')
 
-    file {"${trac::fcgi_config_dir}/${name}.conf":
-      ensure => file,
-      owner => 'root',
-      mode => 644,
+    nginx::hostconfig-fragment {"nginx_fragment_$name":

[Wladimir Palant, 2014/08/14 20:33:50]

No need to duplicate "nginx_fragment" in the name of the fragment -
|nginx::hostconfig-fragment {$name:| is sufficient.

[mathias, 2014/08/18 10:03:26]

Done.

       content => template('trac/fcgi.conf.erb'),
-      require => File[$trac::fcgi_config_dir],
-      notify => Service['nginx'],
+      domain => $trac::domain,
     }
   
     exec {"trac_env_${name}":