Merge pull request voxpupuli#715 from 3flex/694-deprecate-proxy_conf_…

…template Deprecate $proxy_conf_template
cegeka · Nov 5, 2015 · 5f2b56c · 5f2b56c
2 parents 34eb303 + 94a751e
commit 5f2b56c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -39,7 +39,7 @@
 
   # Primary Templates
   $conf_template                  = 'nginx/conf.d/nginx.conf.erb',
-  $proxy_conf_template            = 'nginx/conf.d/proxy.conf.erb',
+  $proxy_conf_template            = undef,
   ### END Module/App Configuration ###
 
   ### START Nginx Configuration ###
@@ -122,6 +122,9 @@
   if ($proxy_http_version != undef) {
     validate_string($proxy_http_version)
   }
+  if ($proxy_conf_template != undef) {
+    warn('The $proxy_conf_template parameter is deprecated and has no effect.')
+  }
   validate_bool($confd_purge)
   validate_bool($vhost_purge)
   if ($proxy_cache_path != false) {