wslave 0.3.5 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3005a61b1ba567a6fce7a42060082c45c7f325615dd3f884459c44a001b0a91b
-  data.tar.gz: b57388304f2e9711ee41be958749bbe0d2bc99d2be320c99ac87922745df9cf1
+  metadata.gz: 7beef53bb5664bdd4d7c010e64130366b45d8c51e5914735d20c2c7b7c78ad49
+  data.tar.gz: c217df1bb2f1a3c98cb2ec235009df760e1c21edbf144187c93f92c8a4bffd97
 SHA512:
-  metadata.gz: 8b4bbb740b9c5922bb4bd01c3b2901fa6d9fa211d54d3af3d3c6da6da80c7addd765558f0f943706b8341b065f533e7ea3cf07445e1ebb4b173e448a21d1b276
-  data.tar.gz: 985284c6599e4675807ae3ea4ea6c2c6f363c2d14a6379fcdc6b0989cd05e3279948056f66bc36c3a336e552496cbc29ba63dc33fe295673c427241f07f37ccf
+  metadata.gz: ee80b70f838cfbf0747c3f671a06567f10904f420bfdbde1bfbf0eb8ff460a9e1b1c7d26b5f6e1ae35d92dfde21480f5063907357354ec06060e08212b482382
+  data.tar.gz: ba5543b2123617ac2cdbe19ac1e5a47a5ae1abb53b989229709eb241d67a978c9b73d0dd21731038c447ecc123a58ad0a99a2277ddf3104c2f23d2034cbb8aef

data/base/config/deploy/production.rb

@@ -2,8 +2,8 @@ require 'yaml'
 require 'date'
 require 'wslave_sage'
 
-opts = YAML.load_file('config/definitions.yml')
-db_info = YAML.load_file('config/database.yml')
+opts = YAML.load_file('config/definitions.yml', aliases: true)
+db_info = YAML.load_file('config/database.yml', aliases: true)
 
 deploy_user = opts['deployer']['user']
 deploy_group = opts['deployer']['www_data_group']
@@ -159,9 +159,9 @@ namespace :deploy do
       # replace instances of it with something that won't match
       db_data = db_data.gsub(/#{opts['deployer']['fqdn']['production']}/, anchor)
 
-      # Set staging URL's to the anchor
-      if opts['deployer']['fqdn']['staging'] != ''
-        db_data = db_data.gsub(/#{opts['deployer']['fqdn']['staging']}/, anchor)
+      # Set production URL's to the anchor
+      if opts['deployer']['fqdn']['production'] != ''
+        db_data = db_data.gsub(/#{opts['deployer']['fqdn']['production']}/, anchor)
       end
 
       # Set localhost entries to the anchor
@@ -197,6 +197,16 @@ namespace :deploy do
     end
   end
 
+  desc 'Creates an additional symlink at the path specified in definitions.yml to current/public'
+  task :set_symlink do
+    on roles(:web) do
+      puts 'Setting symlink'
+      if (opts['deployer'].include?('symlink') && opts['deployer']['symlink'].include?('production'))
+        execute "ln -s #{deploy_path}/current/public #{opts['deployer']['root']}/#{opts['deployer']['symlink']['production']}"
+      end
+    end
+  end
+
   desc 'Perform special seed tasks required on intial seed'
   task :initial do
     on roles(:web) do
@@ -220,6 +230,7 @@ namespace :deploy do
       invoke('deploy:chikan')
       invoke('deploy:sage')
       invoke('deploy:set_permissions')
+      invoke('deploy:set_symlink')
     end
   end
 

data/base/config/deploy/staging.rb

@@ -2,8 +2,8 @@ require 'yaml'
 require 'date'
 require 'wslave_sage'
 
-opts = YAML.load_file('config/definitions.yml')
-db_info = YAML.load_file('config/database.yml')
+opts = YAML.load_file('config/definitions.yml', aliases: true)
+db_info = YAML.load_file('config/database.yml', aliases: true)
 
 deploy_user = opts['deployer']['user']
 deploy_group = opts['deployer']['www_data_group']
@@ -197,6 +197,16 @@ namespace :deploy do
     end
   end
 
+  desc 'Creates an additional symlink at the path specified in definitions.yml to current/public'
+  task :set_symlink do
+    on roles(:web) do
+      puts 'Setting symlink'
+      if (opts['deployer'].include?('symlink') && opts['deployer']['symlink'].include?('staging'))
+        execute "ln -s #{deploy_path}/current/public #{opts['deployer']['root']}/#{opts['deployer']['symlink']['staging']}"
+      end
+    end
+  end
+
   desc 'Perform special seed tasks required on intial seed'
   task :initial do
     on roles(:web) do
@@ -220,6 +230,7 @@ namespace :deploy do
       invoke('deploy:chikan')
       invoke('deploy:sage')
       invoke('deploy:set_permissions')
+      invoke('deploy:set_symlink')
     end
   end
 

data/base/config/deploy-tools/gen-wp-config.rb

@@ -8,8 +8,8 @@ def GenerateWPConfig(profile = 'production', out_path = './')
   config_path = File.dirname(File.expand_path(File.dirname(__FILE__)))
   vars = {}
   vars[:profile] = profile.to_sym
-  vars[:db_info] = YAML.load_file("#{config_path}/database.yml")
-  vars[:salt] = YAML.load_file("#{config_path}/salts.yml")
+  vars[:db_info] = YAML.load_file("#{config_path}/database.yml", aliases: true)
+  vars[:salt] = YAML.load_file("#{config_path}/salts.yml", aliases: true)
 
   erb_source = File.read("#{config_path}/deploy-tools/wp-config.php.erb")
   rend = ERB.new(erb_source)

data/base/config/deploy.rb

@@ -1,8 +1,8 @@
 # config valid only for current version of Capistrano
-lock "3.16.0"
+lock "3.17.0"
 
 require 'yaml'
-opts = YAML.load_file('config/definitions.yml')
+opts = YAML.load_file('config/definitions.yml', aliases: true)
 
 set :application, opts['app']['name']
 set :repo_url, opts['app']['repo']

data/base/public/.htaccess

@@ -1,24 +1,22 @@
-<IfModule mod_rewrite.c>
-	RewriteEngine On
-	RewriteBase /
+RewriteEngine On
+RewriteBase /
 
-  # Open the subfoldered index when accessing the apex
-	RewriteRule ^$ wordpress/index.php [L]
+# Open the subfoldered index when accessing the apex
+RewriteRule ^$ wordpress/index.php [L]
 
-  # Special forwarding to wp-admin
-  RewriteRule ^wp-admin$ wp-admin/
-  RewriteRule ^wp-admin/(.*) wordpress/wp-admin/$1 [R=301,L]
+# Special forwarding to wp-admin
+RewriteRule ^wp-admin$ wp-admin/
+RewriteRule ^wp-admin/(.*) wordpress/wp-admin/$1 [R=301,L]
 
-	# Skip real files and directories
-	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteCond %{REQUEST_FILENAME} !-d
+# Skip real files and directories
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
 
-	# Otherwise send it to WordPress
-	RewriteRule .* wordpress/index.php [L]
+# Otherwise send it to WordPress
+RewriteRule .* wordpress/index.php [L]
 
 # BEGIN WordPress
 # END WordPress
-</IfModule>
 
 <FilesMatch ".+\.(blade\.php)$">
     <IfModule mod_authz_core.c>
@@ -31,6 +29,3 @@
         Deny from all
     </IfModule>
 </FilesMatch>
-
-php_value upload_max_filesize 0
-php_value post_max_size 0

data/lib/wslave_new.rb

@@ -53,7 +53,7 @@ class WSlaveNew
       end
     end
 
-    `cd #{path} && git submodule add git://github.com/WordPress/WordPress.git public/wordpress`
+    `cd #{path} && git submodule add https://github.com/WordPress/WordPress.git public/wordpress`
     `cd #{path} && git submodule update --init --recursive public/wordpress`
     if (version == 'edge' || version == 'master')
       `cd #{path}/public/wordpress && git checkout master`

data/templates/config/definitions.yml

@@ -12,6 +12,10 @@ deployer:
   branch: 
     staging: master
     production: master
+  # Uncomment this to create a symlink to the deploy root's current/public at the specified location relative to the deploy root
+  # symlink:
+    # staging:
+    # production:
 app:
   name:
   repo:

data/wslave.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'wslave'
-  s.version     = '0.3.5'
+  s.version     = '0.3.8'
   s.licenses     = ['GPL-3.0', 'AGPL-3.0']
   s.summary     = '"Word Slave" generates and controls a WordPress installation'
   s.description = 'Word Slave includes the wslave command and a control library to generate a ' \
@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
   s.bindir = 'bin'
   s.executables << 'wslave'
 
-  s.add_dependency 'capistrano', '= 3.16.0'
-  s.add_dependency 'capistrano-git-with-submodules', '~> 2.0', '2.0.4'
+  s.add_dependency 'capistrano', '= 3.17.0'
+  s.add_dependency 'capistrano-git-with-submodules', '~> 2.0', '2.0.6'
   s.add_dependency 'capistrano-scm-copy', '~> 0.7', '0.7.0'
   s.add_dependency 'capistrano-file-permissions', '~> 1.0', '1.0.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wslave
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.8
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-11 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.16.0
+        version: 3.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.16.0
+        version: 3.17.0
 - !ruby/object:Gem::Dependency
   name: capistrano-git-with-submodules
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +33,7 @@ dependencies:
         version: '2.0'
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '2.0'
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: capistrano-scm-copy
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,7 @@ files:
 - base/config/deploy-tools/wp-config.php.erb
 - base/config/deploy-tools/wp-config.php.local
 - base/config/deploy.rb
+- base/config/deploy/.staging.rb.swp
 - base/config/deploy/production.rb
 - base/config/deploy/staging.rb
 - base/docker-compose.yml