itamae-plugin-recipe-nginx_build 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37eaf0f254530642430a59da8bf226d0f171816e
-  data.tar.gz: 128f02b217f6550d5a146a97c014040ce472ebe0
+  metadata.gz: ffefba9ed0c058e078cd787aec939a7ac8ca9030
+  data.tar.gz: 66d86358911d65fc3cc90d53cb1289b44ce2f499
 SHA512:
-  metadata.gz: dc405a60fb706e06ab5b9ec7014d1b0ac441419364c45ea1f2478d71015cad82c3193de9a5f98f83499a2ddf24859a4ecaeeef791b8df877ee84709fdc47c8c4
-  data.tar.gz: 641340093d583222d7314ef3dfedb4494eb54c5eb1f6ba75206bfd7785d6f637fd45bba8c7b78fbe2ae256028678dd87df8ac12979df4a5d45cb2325b4a73ee4
+  metadata.gz: becba8a83c24052ad17c599ee330bb5ba58ae9c95077aed2bf884c5155ffb798ede97385d0c9f7d71fd7237d1004fe5ae9ed73a3d5ac12732b3f8a1d7b818ca9
+  data.tar.gz: aac1f0da61851142f1d07ee62a14b83612e73f1ad8e1bf7cd8619b9477268cde1f704bfeb07205709c5a4490e9c4fd4506f28ca94f22e33d27edc311748f7dd4

data/README.md

@@ -74,7 +74,8 @@ nginx_build:
     prefix: /etc/nginx
     error-log-path: /var/log/nginx/error.log
     http-log-path: /var/log/nginx/access.log
-
+  build_target: openresty
+  openresty_version: 1.11.2.2
 ```
 
 ## Contributing

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

@@ -9,6 +9,10 @@ def build_nginx_configure_options
   nginx_configure_options
 end
 
+def openresty?
+  node[:nginx_build] && node[:nginx_build][:build_target] && node[:nginx_build][:build_target] == 'openresty'
+end
+
 nginx_build_bin = "/usr/local/bin/"
 nginx_build_bin = node[:nginx_build][:bin] if node[:nginx_build] && node[:nginx_build][:bin]
 
@@ -38,12 +42,24 @@ modules3rd_path = node[:nginx_build][:modules3rd_path] if node[:nginx_build] &&
 nginx_modules3rds = []
 nginx_modules3rds = node[:nginx_build][:modules3rds] if node[:nginx_build] && node[:nginx_build][:modules3rds]
 
-nginx_version = "1.8.0"
-nginx_version = node[:nginx_build][:nginx_version] if node[:nginx_build] && node[:nginx_build][:nginx_version]
-
 build_user = node[:server][:user]
 build_user = node[:nginx_build][:build_user] if node[:nginx_build] && node[:nginx_build][:build_user]
 
+configure_command = "#{nginx_build_bin}nginx-build -d work -c #{configure_path} -m #{modules3rd_path}"
+work_dir = ''
+if openresty?
+  openresty_version = '1.11.2.2'
+  openresty_version = node[:nginx_build][:openresty_version] if node[:nginx_build] && node[:nginx_build][:openresty_version]
+  configure_command << " -openresty -openrestyversion #{openresty_version}"
+  work_dir = "~/work/openresty/#{openresty_version}/openresty-#{openresty_version}"
+else
+  nginx_version = '1.8.0'
+  nginx_version = node[:nginx_build][:nginx_version] if node[:nginx_build] && node[:nginx_build][:nginx_version]
+  configure_command << " -v #{nginx_version}"
+  work_dir = "~/work/nginx/#{nginx_version}/nginx-#{nginx_version}"
+end
+nginx_build_command = "#{configure_command} && cd #{work_dir} && sudo make install"
+
 if configure_path =~ /^(.+)\/([^\/]+)$/
   directory $1
 
@@ -78,8 +94,7 @@ if modules3rd_path =~ /^(.+)\/([^\/]+)$/
 end
 
 execute "build-nginx" do
-  command "#{nginx_build_bin}nginx-build -d work -v #{nginx_version} -c #{configure_path} -m #{modules3rd_path} && \
-           cd ~/work/nginx/#{nginx_version}/nginx-#{nginx_version} && sudo make install"
+  command nginx_build_command
   user build_user
   action :nothing
 end

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

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module NginxBuild
-        VERSION = "0.1.5"
+        VERSION = "0.1.6"
       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.5
+  version: 0.1.6
 platform: ruby
 authors:
 - zaru
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Itamae plugin to install nginx-build