Bump to v0.4.4. Add more customization to Nginx templates.

nollieheel · Earth Ugat
1 parent b17c192a
Showing 4 changed files with 39 additions and 27 deletions
CHANGELOG.md
attributes/default.rb
metadata.rb
recipes/nginx_configure.rb
--- a/CHANGELOG.md
View file @baae975
+++ b/CHANGELOG.md
View file @baae975
+## 0.4.4 - 2016-11-09
+### Added
+- Nginx recipe: Add template file customization for the main site config and for all site types.
+
 ## 0.4.3 - 2016-10-06
 ### Fixed
 - Missing ssl key and cert clauses in the "catch_all" blocks in the nginx config causes an error during SSL handshake if HTTPS is used.
--- a/attributes/default.rb
View file @baae975
+++ b/attributes/default.rb
View file @baae975
@@ -146,6 +146,12 @@ default['cfe-nginx-php-fpm']['nginx']['sites'] = [
     #
     #:server_statements_2 => [],
+    # The cookbook name and source file where the main
+    # config file template will be taken from.
+    #
+    #:main_config_cookbook => 'cfe-nginx-php-fpm',
+    #:main_config_source   => 'nginx_site.conf.erb',
+
     # Enumerates the different site types this server supports.
     # Each type element of this array is a hash containing different attributes.
     #
@@ -179,6 +185,14 @@ default['cfe-nginx-php-fpm']['nginx']['sites'] = [
     #                    }
     #   :log_static => Whether to log accesses to the above static files
     #                  or not. Default: false
+    #   :source => The name of the config template.
+    #              Default depends on :type attribute.
+    #   :cookbook => The name of the cookbook where the template
+    #                will be taken from. Default is this cookbook.
+    #   :custom_params => A hash that will be passed into the template
+    #                     (along with the optional attributes mentioned
+    #                     above) as the variable called cparams.
+    #                     Default: {}
     #
     # Unique attributes for each type are indicated below:
     #   Basic PHP Site (:type => 'basic_php'):
@@ -191,18 +205,7 @@ default['cfe-nginx-php-fpm']['nginx']['sites'] = [
     #   Proxy Websocket Webserver (:type => 'webserver_ws'):
     #     (none)
     #   Proxy Generic Webserver (:type => 'webserver_basic'):
-    #     :source => The name of the config template.
-    #                Default is 'inc_type_webserver_basic.erb'.
-    #     :cookbook => The name of the cookbook where the template
-    #                  will be taken from. Default is this cookbook.
-    #                  In combination with the :source attribute above,
-    #                  any custom template in a wrapper cookbook can be
-    #                  used. A template file 'inc_type_webserver_basic.erb'
-    #                  exists as an example.
-    #     :custom_params => A hash that will be passed into the template
-    #                       (along with the optional attributes mentioned
-    #                       above) as the variable called cparams.
-    #                       Default: {}
+    #     (none)
     #
     #:types => []
   #}
--- a/metadata.rb
View file @baae975
+++ b/metadata.rb
View file @baae975
@@ -4,7 +4,7 @@ maintainer_email 'sysadmin@chromedia.com'
 license          'Apache License'
 description      'Simplifies setup of Nginx+PHP-FPM in Chromedia.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.4.3'
+version          '0.4.4'
 {
   'openssl' => '4.4.0',
--- a/recipes/nginx_configure.rb
View file @baae975
+++ b/recipes/nginx_configure.rb
View file @baae975
@@ -65,6 +65,8 @@ node[cb]['nginx']['sites'].each do |site|
   site_ins      = site[:init_statements] || []
   site_ss1      = site[:server_statements_1] || []
   site_ss2      = site[:server_statements_2] || []
+  site_cb       = site[:main_config_cookbook] || cb
+  site_source   = site[:main_config_source] || 'nginx_site.conf.erb'
   site_bl_robots = site.has_key?(:block_robots) ? site[:block_robots] : true
   site_bl_fav    = site.has_key?(:block_fav) ? site[:block_fav] : true
@@ -82,9 +84,9 @@ node[cb]['nginx']['sites'].each do |site|
     'X-Permitted-Cross-Domain-Policies' => 'none'
   }
-  path_crt     = ''
-  path_key     = ''
-  path_pass    = ''
+  path_crt  = ''
+  path_key  = ''
+  path_pass = ''
   # If TLS/SSL is enabled, configure it:
   if site_ssl
@@ -176,7 +178,8 @@ node[cb]['nginx']['sites'].each do |site|
       :upstream_name  => stype_ups,
       :add_statements => stype_ads,
       :static_types   => stype_statics,
-      :log_static     => stype_logstatic
+      :log_static     => stype_logstatic,
+      :cparams        => stype[:custom_params] || {}
     }
     if stype[:upstream_servers] && stype[:upstream_servers].length > 0
@@ -195,8 +198,9 @@ node[cb]['nginx']['sites'].each do |site|
         stype[:fastcgi_intercept_errors] : false
       template "#{inc_dir}/type_basic_php_#{site_sname}" do
-        source 'inc_type_basic.erb'
-        mode   0644
+        source    stype[:source] || 'inc_type_basic.erb'
+        cookbook  stype[:cookbook] || cb
+        mode      0644
         variables vars
       end
       site_includes.push("#{inc_dir}/type_basic_php_#{site_sname}")
@@ -210,8 +214,9 @@ node[cb]['nginx']['sites'].each do |site|
         stype[:fastcgi_intercept_errors] : false
       template "#{inc_dir}/inc_type_wordpress_#{site_sname}" do
-        source 'inc_type_wordpress.erb'
-        mode   0644
+        source    stype[:source] || 'inc_type_wordpress.erb'
+        cookbook  stype[:cookbook] || cb
+        mode      0644
         variables vars
       end
       site_includes.push("#{inc_dir}/inc_type_wordpress_#{site_sname}")
@@ -219,8 +224,9 @@ node[cb]['nginx']['sites'].each do |site|
     # REVERSE PROXY WEBSERVER WITH WEBSOCKET
     when 'webserver', 'webserver_ws'
       template "#{inc_dir}/inc_type_webserver_ws_#{site_sname}" do
-        source 'inc_type_webserver.erb'
-        mode   0644
+        source    stype[:source] || 'inc_type_webserver.erb'
+        cookbook  stype[:cookbook] || cb
+        mode      0644
         variables vars
       end
       site_ins.push("map $http_upgrade $connection_upgrade {\n"\
@@ -231,11 +237,9 @@ node[cb]['nginx']['sites'].each do |site|
     # GENERIC REVERSE PROXY WEBSERVER
     when 'webserver_basic'
-      vars[:cparams] = stype[:custom_params] || {}
-
       template "#{inc_dir}/inc_type_webserver_basic_#{site_sname}" do
         source    stype[:source] || 'inc_type_webserver_basic.erb'
-        cookbook  stype[:cookbook] || cookbook_name
+        cookbook  stype[:cookbook] || cb
         mode      0644
         variables vars
       end
@@ -249,7 +253,8 @@ node[cb]['nginx']['sites'].each do |site|
   # Create the main config file for this site
   template "#{node['nginx']['dir']}/sites-available/#{site_sname}" do
-    source   'nginx_site.conf.erb'
+    source   site_source
+    cookbook site_cb
     mode     0644
     notifies :restart, 'service[nginx]', :delayed
     variables(