itamae-plugin-recipe-daddy 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3858b7daba5155c731a7213933da0e7dc65f37523e28bbb29351f79d607da9b1
-  data.tar.gz: 25a7724f359586cd52347eeef09c0a8ada8dc22307c7ffd2996a69c2b4b6422f
+  metadata.gz: a9158d7ec94839e41b3aa50e4759d4ccf3105851e52bc190fd80101980e7d3f9
+  data.tar.gz: 60fbbf968ef8b825ca949c87cf60b7eff4dee69307a14c128de8403b71054a86
 SHA512:
-  metadata.gz: 2974f7d7dcb395fb974875701ee3b261a2d2a11c9463e57809176a9015e33f0218b256b615268390a256601157da6614e5351840fe8075d616c29fd97b20d1ef
-  data.tar.gz: 7027be10edbebffe03cf3d86f0109806a3a559e59aa6554f037f94f6a43c3d0aa64aa699c187a43a367b0ab1c667cae90b72b4dba5d6ed810a55ca7f09568f7b
+  metadata.gz: 649568fa96708b94b469a43f9d7959365329855289a5aa53508a7ff0401ea763c5f0a50d64942f5644c19ef6b3ddf2e9b4c313075b3cc520de663994a61a1956
+  data.tar.gz: ee54a27af44001a05db34b5c56c988779cef68a9328893eeb86208079748c3b6789d0a192f7a30cf938bec3eaf22dc79b1dc4c055c5c7606422b84490d385815

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    itamae-plugin-recipe-daddy (0.1.2)
+    itamae-plugin-recipe-daddy (0.1.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/itamae/plugin/recipe/daddy/mysql/templates/my.cnf.erb

@@ -0,0 +1,15 @@
+[mysqld]
+datadir=/var/lib/mysql
+socket=/var/lib/mysql/mysql.sock
+user=mysql
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+
+character-set-server = utf8
+
+[mysql]
+default-character-set = utf8
+
+[mysqld_safe]
+log-error=/var/log/mysqld.log
+pid-file=/var/run/mysqld/mysqld.pid

data/lib/itamae/plugin/recipe/daddy/nginx/install.rb

@@ -7,8 +7,8 @@ directory 'tmp'
 # install destination
 %w{
   /opt/nginx
-  /opt/nginx/cache
   /opt/nginx/shared
+  /opt/nginx/shared/letsencrypt
   /opt/nginx/shared/logs
 }.each do |name|
   directory name do
@@ -19,6 +19,17 @@ directory 'tmp'
   end
 end
 
+%w{
+  /opt/nginx/cache
+}.each do |name|
+  directory name do
+    user 'root'
+    owner 'nobody'
+    group 'root'
+    mode '755'
+  end
+end
+
 # nginx source
 execute 'download nginx' do
   cwd 'tmp'
@@ -107,6 +118,10 @@ directory '/etc/nginx/conf.d/servers' do
   mode '755'
 end
 
+if Daddy.config.app.type?
+  include_recipe File.join(File.dirname(File.dirname(__FILE__)), Daddy.config.app.type, 'install.rb')
+end
+
 template '/lib/systemd/system/nginx.service' do
   user 'root'
 end

data/lib/itamae/plugin/recipe/daddy/passenger/install.rb

@@ -0,0 +1,21 @@
+server_name = ENV['SERVER_NAME'] || Daddy.config.web.server_name
+rails_env = ENV['RAILS_ENV'] || Daddy.config.rails_env? ? Daddy.config.rails_env : 'development'
+rails_root = ENV['RAILS_ROOT'] || Daddy.config.rails_root? ? Daddy.config.rails_root : File.expand_path('.')
+
+template "/etc/nginx/conf.d/servers/#{server_name}.conf" do
+  source ::File.join(File.dirname(__FILE__), 'templates', '_passenger.conf.erb')
+  user 'root'
+  owner 'root'
+  group 'root'
+  mode '644'
+  variables server_name: server_name, rails_env: rails_env, rails_root: rails_root
+end
+
+if rails_root.start_with?("/home/#{ENV['USER']}/")
+  directory "/home/#{ENV['USER']}" do
+    user 'root'
+    owner ENV['USER']
+    group ENV['USER']
+    mode '755'
+  end
+end

data/lib/itamae/plugin/recipe/daddy/passenger/templates/_passenger.conf.erb

@@ -0,0 +1,42 @@
+<%-
+  @letsencrypt = system("sudo test -e /etc/letsencrypt/live/#{@server_name}/fullchain.pem")
+  @selfsigned = system('sudo test -e /etc/pki/tls/certs/localhost.crt')
+  @ssl = @letsencrypt || @selfsigned
+-%>
+server {
+  listen 80;
+<%- if @ssl -%>
+  listen 443 ssl;
+<%- end -%>
+  server_name <%= @server_name %>;
+  access_log /opt/nginx/shared/logs/<%= @server_name %>_access.log ltsv;
+
+<%- if @letsencrypt -%>
+  ssl_certificate /etc/letsencrypt/live/<%= @server_name %>/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/<%= @server_name %>/privkey.pem;
+
+  location ^~ /.well-known/acme-challenge/ {
+    default_type "text/plain";
+    root /opt/nginx/shared/letsencrypt;
+  }
+<%- elsif @selfsigned -%>
+  ssl_certificate /etc/pki/tls/certs/localhost.crt;
+  ssl_certificate_key /etc/pki/tls/private/localhost.key;
+<%- end -%>
+
+  location / {
+    root <%= ::File.join(@rails_root, 'public') %>;
+    passenger_enabled on;
+    passenger_app_env <%= @rails_env %>;
+  }
+
+  gzip on;
+  gzip_http_version 1.0;
+  gzip_proxied any;
+  gzip_min_length 500;
+  gzip_disable "MSIE [1-6]\.";
+  gzip_types text/plain text/xml text/css
+             text/comma-separated-values
+             text/javascript application/x-javascript
+             application/atom+xml;
+}

data/lib/itamae_plugin_recipe_daddy/version.rb

@@ -1,5 +1,5 @@
 module ItamaePluginRecipeDaddy
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 
   NGINX_VERSION = [
     NGINX_VERSION_MAJOR = '1',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-daddy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-22 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,7 @@ files:
 - lib/itamae/plugin/recipe/daddy/mysql/install.rb
 - lib/itamae/plugin/recipe/daddy/mysql/mysql_secure_installation.sh
 - lib/itamae/plugin/recipe/daddy/mysql/templates/daddy.cnf.erb
+- lib/itamae/plugin/recipe/daddy/mysql/templates/my.cnf.erb
 - lib/itamae/plugin/recipe/daddy/nginx/install.rb
 - lib/itamae/plugin/recipe/daddy/nginx/modules/nginx-rtmp-module.rb
 - lib/itamae/plugin/recipe/daddy/nginx/modules/passenger.rb
@@ -70,6 +71,8 @@ files:
 - lib/itamae/plugin/recipe/daddy/nginx/templates/etc/nginx/nginx.conf.erb
 - lib/itamae/plugin/recipe/daddy/nginx/templates/etc/tmpfiles.d/passenger.conf.erb
 - lib/itamae/plugin/recipe/daddy/nginx/templates/lib/systemd/system/nginx.service.erb
+- lib/itamae/plugin/recipe/daddy/passenger/install.rb
+- lib/itamae/plugin/recipe/daddy/passenger/templates/_passenger.conf.erb
 - lib/itamae/plugin/recipe/daddy/redis/install.rb
 - lib/itamae_plugin_recipe_daddy/daddy.rb
 - lib/itamae_plugin_recipe_daddy/version.rb
@@ -93,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: itamae recipe collections