itamae-plugin-recipe-openresty 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f89efec1e48122b252dbd9218ca1dbc5e5fd51f2
-  data.tar.gz: c7b2b56851f14337ac97baa61436460a9d36445d
+  metadata.gz: e7243dd38145bf70b65578a45576912a5865e1ac
+  data.tar.gz: 1301b2564549888afb7f1adf9ef2925ad61adaeb
 SHA512:
-  metadata.gz: 7ea7408b218de9560b9fcd531ccb20a8096c46cff0a52ad397ef186a57943397079145351fbe028688af8df3b0630b0f7ea509e6aa9e564bfd7f9b7c77262d79
-  data.tar.gz: a2c91c07ff8938df69bb81937bfbc1d1a9b48629b088746d388fb161175ee16cd1d22fbc3b060fe4cf9220082a89e72d5e1d1518d6ad2b72d5a4abbb3a200bcb
+  metadata.gz: 6858502832bf6e4ac6979f4598cc60b03c063169a0ec1fab206cc59f9056974cc1373d2973dae6caf63571a70ecd48300f7dfef169c242fd65d5bfc73b756eec
+  data.tar.gz: 3ac0045c25eb84ca1325aa9133d2ca0950a12044cdf1c9cef99cbed97e276e99255486fca92127ee411d29144f6ebb1739e64f917e52335780a7ecfa698eaae2

data/README.md

@@ -1,6 +1,6 @@
 # Itamae::Plugin::Recipe::Openresty
 
-TODO: Write a gem description
+Itamae plugin to install [OpenResty](https://openresty.org/) with init scripts
 
 ## Installation
 
@@ -20,11 +20,41 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Write a following line to your itamae recipe.
+
+```rb
+# recipe.rb
+
+# Install openresty from source
+include_recipe 'openresty::source'
+service 'openresty'
+```
+
+Execute it with: `itamae ssh -h ... recipe.rb`.
+
+```yml
+# node.yml
+openresty:
+  version: 1.11.2.1
+  archive_url: https://openresty.org/download/openresty-1.11.2.1.tar.gz
+  work_dir: /tmp/openresty
+  install_depends_package: true
+  configure_flags:
+    prefix: /opt
+    with-lua51:
+    with-luajit:
+    with-pcre-jit:
+    with-http_gzip_static_module:
+    user: nginx
+    group: nginx
+    config-path: /opt/nginx/conf/nginx.conf
+    pid-path: /opt/nginx/logs/nginx.pid
+    sbin-path: /opt/nginx/sbin/nginx
+```
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/itamae-plugin-recipe-openresty/fork )
+1. Fork it ( https://github.com/TakatoshiMaeda/itamae-plugin-recipe-openresty/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/itamae/plugin/recipe/openresty.rb

@@ -4,7 +4,7 @@ module Itamae
   module Plugin
     module Recipe
       module Openresty
-        DEFAULT_VERSION = '1.7.4.1'.freeze
+        DEFAULT_VERSION = '1.11.2.1'.freeze
 
         DEFAULT_PACKAGES = {
           ubuntu: [
@@ -44,7 +44,7 @@ module Itamae
 
           metadata = {}
           metadata[:version]                 = raw['version'] || DEFAULT_VERSION
-          metadata[:archive_url]             = raw['archive_url'] || "http://openresty.org/download/ngx_openresty-#{metadata[:version]}.tar.gz"
+          metadata[:archive_url]             = raw['archive_url'] || "https://openresty.org/download/openresty-#{metadata[:version]}.tar.gz"
           metadata[:work_dir]                = raw['work_dir'] || BUILD_WORKING_DIR
           metadata[:configure_flags]         = self.extract_configure_flags(raw['configure_flags'])
           metadata[:install_depends_package] = raw['install_depends_package'] || true

data/lib/itamae/plugin/recipe/openresty/source.rb

@@ -3,7 +3,7 @@ require 'itamae/plugin/recipe/openresty'
 metadata = Itamae::Plugin::Recipe::Openresty.extract_metadata(node)
 
 if metadata[:install_depends_package]
-  Itamae::Plugin::Recipe::Openresty::DEFAULT_PACKAGES[os[:family].to_sym].each do |pkg|
+  Itamae::Plugin::Recipe::Openresty::DEFAULT_PACKAGES[node[:platform].to_sym].each do |pkg|
     package pkg
   end
 end
@@ -14,18 +14,18 @@ end
 
 execute 'download openresty archive file' do
   command "wget #{metadata[:archive_url]} -O #{metadata[:work_dir]}/openresty.tar.gz"
-  not_if "test #{metadata[:work_dir]}/openresty.tar.gz"
+  not_if "test -f #{metadata[:work_dir]}/openresty.tar.gz"
 end
 
 execute 'unzip openresty' do
   command "tar xvfz #{metadata[:work_dir]}/openresty.tar.gz -C #{metadata[:work_dir]}"
-  not_if "test #{metadata[:work_dir]}/ngx_openresty-#{metadata[:version]}"
+  not_if "test -d #{metadata[:work_dir]}/openresty-#{metadata[:version]}"
 end
 
 execute 'build openresty' do
-  command "cd #{metadata[:work_dir]}/ngx_openresty-#{metadata[:version]} && ./configure #{metadata[:configure_flags].join(' ')} && make && make install"
+  command "cd #{metadata[:work_dir]}/openresty-#{metadata[:version]} && ./configure #{metadata[:configure_flags].join(' ')} && make && make install"
   unless ENV['OPENRESTY_REBUILD'] != nil
-    not_if "test #{Itamae::Plugin::Recipe::Openresty.sbin_path(node)}"
+    not_if "test -f #{Itamae::Plugin::Recipe::Openresty.sbin_path(node)}"
   end
 end
 
@@ -38,7 +38,7 @@ end
 
 execute 'setup openresty init script' do
   command "chmod +x #{init_script_options[:init_script_path]}"
-  only_if "test #{init_script_options[:init_script_path]}"
+  only_if "test -f #{init_script_options[:init_script_path]}"
 end
 
 service 'openresty' do

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

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module Openresty
-        VERSION = "0.0.1"
+        VERSION = "0.0.2"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-openresty
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Takatoshi Maeda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-29 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Itamae openresty recipe plugin