daddy 0.5.28 → 0.5.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d90e6edba15aee3a43fa787d6447271de0af026
-  data.tar.gz: 7e650044d32e89727f8b67cbbfa6f9374c1de8c4
+  metadata.gz: 32a516b09cf8ccd27d30550f10481276c00a84ba
+  data.tar.gz: 72ce8af4ac16b3948cb9a25a280aff168a8bbe50
 SHA512:
-  metadata.gz: 6f7077920cf66005898f32172251d568ccfbc45678db016b1acc59d49e9103c4b4cfa64f7c727467080c5862fc4b7290c0ac121f6227a31e913cb1619b500fec
-  data.tar.gz: c36de8016e7041551c2044f73a391ed4e61ed5b86a0e2c504fe8863639c57ccb88634a481daf8f5f70de9e820c50adb1a50ed8f1e5fcad5ee0c296c7dfd91f54
+  metadata.gz: 2e5d1f37b11f3ae9723df1b79fd6659a199a86e0a5865ea600b93d2269a6fe56fd5ded866c53798132344703aad69a6e7e8b174ab33568dcdd6eb821bd888721
+  data.tar.gz: de327628c3d92c4ed1684f33136826a487695d09ac52216710eb626483647a2014b2f7cd636a013e10b86bcc9650f3f14dce2d1354e3acbea5e90810231c7597

data/itamae/cookbooks/nginx/install.rb

@@ -1,10 +1,24 @@
 require 'daddy/itamae'
 
 dad_nginx_checksum = File.join(File.dirname(__FILE__), 'sha256sum.txt')
-dad_nginx_version = '1.12.0'
+dad_nginx_version = '1.13.1'
 
 directory 'tmp'
 
+# install destination
+%w{
+  /opt/nginx
+  /opt/nginx/shared
+  /opt/nginx/shared/logs
+}.each do |name|
+  directory name do
+    user 'root'
+    owner 'root'
+    group 'root'
+    mode '755'
+  end
+end
+
 # nginx source
 execute 'download nginx' do
   cwd 'tmp'
@@ -26,7 +40,7 @@ execute 'build nginx' do
     tar zxf nginx-#{dad_nginx_version}.tar.gz
     cd nginx-#{dad_nginx_version}
     sudo ./configure \
-      --prefix=/opt/nginx-#{dad_nginx_version} \
+      --prefix=/opt/nginx/nginx-#{dad_nginx_version} \
       --conf-path=/etc/nginx/nginx.conf \
       --pid-path=/run/nginx.pid \
       --with-http_ssl_module \
@@ -36,12 +50,12 @@ execute 'build nginx' do
     make
     sudo make install
   EOF
-  not_if "test -e /opt/nginx-#{dad_nginx_version}"
+  not_if "test -e /opt/nginx/nginx-#{dad_nginx_version}"
 end
 
-link 'nginx' do
+link 'current' do
   user 'root'
-  cwd '/opt'
+  cwd '/opt/nginx'
   to "nginx-#{dad_nginx_version}"
   force true
 end

data/itamae/cookbooks/nginx/sha256sum.txt

@@ -1 +1 @@
-b4222e26fdb620a8d3c3a3a8b955e08b713672e1bc5198d1e4f462308a795b30  nginx-1.12.0.tar.gz
+a5856c72a6609a4dc68c88a7f3c33b79e6693343b62952e021e043fe347b6776  nginx-1.13.1.tar.gz

data/itamae/cookbooks/nginx/templates/passenger.conf.erb

@@ -9,7 +9,7 @@ server {
   listen 443 ssl;
 <%- end -%>
   server_name <%= @server_name %>;
-  access_log /opt/nginx/logs/<%= @server_name %>_access.log ltsv;
+  access_log /opt/nginx/shared/logs/<%= @server_name %>_access.log ltsv;
 
 <%- if @letsencrypt -%>
   ssl_certificate /etc/letsencrypt/live/<%= @server_name %>/fullchain.pem;

data/itamae/templates/etc/nginx/conf.d/default.conf.erb

@@ -20,7 +20,7 @@ http {
                     'runtime:$upstream_http_x_runtime\t'
                     'vhost:$host';
 
-  access_log  /opt/nginx/logs/access.log  ltsv;
+  access_log  /opt/nginx/shared/logs/access.log  ltsv;
 
   sendfile        on;
   #tcp_nopush     on;

data/itamae/templates/lib/systemd/system/nginx.service.erb

@@ -5,8 +5,8 @@ After=syslog.target network.target remote-fs.target nss-lookup.target
 [Service]
 Type=forking
 PIDFile=/run/nginx.pid
-ExecStartPre=/opt/nginx/sbin/nginx -t
-ExecStart=/opt/nginx/sbin/nginx
+ExecStartPre=/opt/nginx/current/sbin/nginx -t
+ExecStart=/opt/nginx/current/sbin/nginx
 ExecReload=/bin/kill -s HUP $MAINPID
 ExecStop=/bin/kill -s QUIT $MAINPID
 PrivateTmp=true

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.5.28'
+  VERSION = '0.5.29'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.5.28
+  version: 0.5.29
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara