Merge pull request #1451 from TuningYourCode/overwrite-templates

Add variables to overwrite fastcgi.conf and uwsgi_params template

Author: bastelfreak

manifests/init.pp

@@ -73,7 +73,9 @@
   Boolean $include_modules_enabled                           = $nginx::params::include_modules_enabled,
 
   # Primary Templates
-  $conf_template                                             = 'nginx/conf.d/nginx.conf.erb',
+  String[1] $conf_template                                   = 'nginx/conf.d/nginx.conf.erb',
+  String[1] $fastcgi_conf_template                           = 'nginx/server/fastcgi.conf.erb',
+  String[1] $uwsgi_params_template                           = 'nginx/server/uwsgi_params.erb',
 
   ### START Nginx Configuration ###
   Optional[Enum['on', 'off']] $absolute_redirect             = undef,

manifests/resource/location.pp

@@ -346,7 +346,7 @@
     file { $fastcgi_params:
       ensure  => 'file',
       mode    => $nginx::global_mode,
-      content => template('nginx/server/fastcgi.conf.erb'),
+      content => template($nginx::fastcgi_conf_template),
       tag     => 'nginx_config_file',
     }
   }
@@ -355,7 +355,7 @@
     file { $uwsgi_params:
       ensure  => 'file',
       mode    => $nginx::global_mode,
-      content => template('nginx/server/uwsgi_params.erb'),
+      content => template($nginx::uwsgi_params_template),
       tag     => 'nginx_config_file',
     }
   }

manifests/resource/server.pp

@@ -567,15 +567,15 @@
     file { $fastcgi_params:
       ensure  => file,
       mode    => $nginx::global_mode,
-      content => template('nginx/server/fastcgi.conf.erb'),
+      content => template($nginx::fastcgi_conf_template),
     }
   }
 
   if $uwsgi != undef and !defined(File[$uwsgi_params]) and $uwsgi_params == "${nginx::conf_dir}/uwsgi_params" {
     file { $uwsgi_params:
       ensure  => file,
       mode    => $nginx::global_mode,
-      content => template('nginx/server/uwsgi_params.erb'),
+      content => template($nginx::uwsgi_params_template),
     }
   }