itamae-plugin-recipe-nginx_build 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b04cdd5719b7dba6c55e696134518fefa1d2cb6
-  data.tar.gz: d30db3a2978703f22cef085e9feca0db4337823d
+  metadata.gz: 37eaf0f254530642430a59da8bf226d0f171816e
+  data.tar.gz: 128f02b217f6550d5a146a97c014040ce472ebe0
 SHA512:
-  metadata.gz: 70d287037ebf0af11abadd65e74ab4e809b0bca18c1755e129d2bd710f04c58c5a986d1ae2b3915aa19805274fdc78f76bc7909aaf83d60c9f1536eab6d778ff
-  data.tar.gz: 28228bce16acc3d78ffec8b00ecf1febbfb941716b75965ef71223fb154d4f399e0d4113523e7788734039e3b6ef30a30c6b0010cadadd28ac00515546ff7ea9
+  metadata.gz: dc405a60fb706e06ab5b9ec7014d1b0ac441419364c45ea1f2478d71015cad82c3193de9a5f98f83499a2ddf24859a4ecaeeef791b8df877ee84709fdc47c8c4
+  data.tar.gz: 641340093d583222d7314ef3dfedb4494eb54c5eb1f6ba75206bfd7785d6f637fd45bba8c7b78fbe2ae256028678dd87df8ac12979df4a5d45cb2325b4a73ee4

data/README.md

@@ -70,6 +70,11 @@ nginx_build:
       shprov: ./setup
   configure_path: /usr/local/nginx_build/configure.sh
   modules3rd_path: /usr/local/nginx_build/modules3rd.ini
+  configure_options:
+    prefix: /etc/nginx
+    error-log-path: /var/log/nginx/error.log
+    http-log-path: /var/log/nginx/access.log
+
 ```
 
 ## Contributing

data/lib/itamae/plugin/recipe/nginx_build/install.rb

@@ -1,3 +1,14 @@
+def build_nginx_configure_options
+  nginx_configure_options = %w(--with-http_ssl_module)
+  if node[:nginx_build] && node[:nginx_build][:modules]
+    nginx_configure_options = node[:nginx_build][:modules].map {|mod| "--with-#{mod}" }
+  end
+  if node[:nginx_build] && node[:nginx_build][:configure_options]
+    nginx_configure_options |= node[:nginx_build][:configure_options].map {|k, v| "--#{k}=#{v}" }
+  end
+  nginx_configure_options
+end
+
 nginx_build_bin = "/usr/local/bin/"
 nginx_build_bin = node[:nginx_build][:bin] if node[:nginx_build] && node[:nginx_build][:bin]
 
@@ -16,8 +27,7 @@ nginx_conf = node[:nginx_build][:nginx_conf] if node[:nginx_build] && node[:ngin
 nginx_pid = "/var/run/nginx.pid"
 nginx_pid = node[:nginx_build][:nginx_pid] if node[:nginx_build] && node[:nginx_build][:nginx_pid]
 
-nginx_modules = %w(http_ssl_module)
-nginx_modules = node[:nginx_build][:modules] if node[:nginx_build] && node[:nginx_build][:modules]
+nginx_configure_options = build_nginx_configure_options
 
 configure_path = '/usr/local/nginx_build/configure.sh'
 configure_path = node[:nginx_build][:configure_path] if node[:nginx_build] && node[:nginx_build][:configure_path]
@@ -40,12 +50,12 @@ if configure_path =~ /^(.+)\/([^\/]+)$/
   template configure_path do
     source "./templates/configure.sh.erb"
     variables({
-                  "nginx_user"    => nginx_user,
-                  "nginx_group"   => nginx_group,
-                  "nginx_sbin"    => nginx_sbin,
-                  "nginx_conf"    => nginx_conf,
-                  "nginx_pid"     => nginx_pid,
-                  "nginx_modules" => nginx_modules
+                  "nginx_user"              => nginx_user,
+                  "nginx_group"             => nginx_group,
+                  "nginx_sbin"              => nginx_sbin,
+                  "nginx_conf"              => nginx_conf,
+                  "nginx_pid"               => nginx_pid,
+                  "nginx_configure_options" => nginx_configure_options,
               })
 
     notifies :run, 'execute[build-nginx]'

data/lib/itamae/plugin/recipe/nginx_build/templates/configure.sh.erb

@@ -6,4 +6,4 @@
     --sbin-path=<%=@nginx_sbin%> \
     --conf-path=<%=@nginx_conf%> \
     --pid-path=<%=@nginx_pid%> \
-<% @nginx_modules.each {|m| %>  --with-<%=m%> <% } %>
+<%= @nginx_configure_options.join(' ') %>

data/lib/itamae/plugin/recipe/nginx_build/version.rb

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module NginxBuild
-        VERSION = "0.1.4"
+        VERSION = "0.1.5"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-nginx_build
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - zaru
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae