wslave 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d188cdc015b755f1e01d0df9ef90799e820e51c96b35f33eb2de27ebfe36ef2e
-  data.tar.gz: b0ec2a12644b5a3375b17f2debb46b32b63c47331ab12410d24d4af6c1aab41c
+  metadata.gz: c8df8f2d9fb3ddae0dfbc1d47fdf8107b20c455e3d4eadb15538e1d9483cfcb8
+  data.tar.gz: ab496e09948a4edf41cc828c01a34487cb7a29633c203356b231e967f582d4a9
 SHA512:
-  metadata.gz: ba61bfce1a0ac8e1132e4f0c9dd346f497357a0a67110bcbd5d8bf4191dd282e265661b351373f5ca8227a8b2ff9d473360558c8835e7b78594f95c5bc2eb0e6
-  data.tar.gz: ef22c14d6e42cd107148e088abd7121f491db53d4af8c73e213c4f5976b7ad6fb03ff94feffbb415502523d633fe370f1906dd3cfaf0d9c875fed0f8c9c07aaa
+  metadata.gz: c97f9515d2229be7bfee1b2e1df26347be54f178e47382bf67390651dba0aa10ec1158574e5aedd3e233ec610be25ae9a42afd03f4e27c427ea148780dad21aa
+  data.tar.gz: 9622367e6bd226bc525146f6792fb598220397528055946e393dbc1f1952215b1ade9b90a010420d30748944875105e545f68fa15896a9caddce594c4c3e1ee8

data/base/.gitignore

@@ -0,0 +1,4 @@
+log
+.swp
+.swo
+db/tmp/*

data/base/Dockerfile

@@ -1,13 +1,13 @@
-FROM php:5.6-apache
+FROM php:7.2.6-apache
 
 RUN a2enmod rewrite
 RUN service apache2 restart
 RUN apt-get update \
-&& apt-get install -y libpng12-dev libjpeg-dev mysql-client \
+&& apt-get install -y libpng-dev libjpeg-dev mysql-client mysql-common \
 && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
 && docker-php-ext-install gd \
 && docker-php-ext-install mbstring \
-&& docker-php-ext-install mysql \
+# && docker-php-ext-install mysql \
 && docker-php-ext-install mysqli \
 && docker-php-ext-install pdo \
 && docker-php-ext-install pdo_mysql \

data/base/config/deploy-tools/gen-nginx-vhost.rb

@@ -0,0 +1,11 @@
+require 'erb'
+require 'yaml'
+require 'ostruct'
+
+def GenerateNginxConfig(profile = 'production', out_path= './')
+  config_path = File.dirname(File.expand_path(File.dirname(__FILE__)))
+  server = {}
+  #server[:name] =
+  #server[:root] =
+  #server[:php_sock_path] =
+end

data/base/config/deploy-tools/nginx.vhost.erb

@@ -0,0 +1,35 @@
+server {                                                                       
+    listen 80;
+	listen [::]:80;
+
+	server_name <%= server[:name] %>;
+
+    root <%= server[:root] %>;
+
+    access_log <%= server[:root] %>/access.log;
+    error_log <%= server[:root] %>/error.log;
+
+    index index.php;
+
+    location / {
+        rewrite ^/(wp-(admin|includes).*) /wordpress/$1 last;
+
+        rewrite ^/$ /wordpress/index.php last;
+
+        location ~ \.php {
+            if ($request_uri !~* "/wp-config.php") {
+                rewrite ^/wp-(.*)\.php$ /wordpress/wp-$1.php last;
+            }
+            rewrite ^/index\.php$ /wordpress/index.php last;
+            rewrite ^/wp-login\.php$ /hello.php last;
+            include snippets/fastcgi-php.conf;
+            fastcgi_pass unix:<%= server[:php_sock_path] %>;
+        }
+    }
+
+    location ~ /\. {
+        deny all;
+        access_log off;
+        log_not_found off;
+    }
+} 

data/base/config/deploy.rb

@@ -1,5 +1,5 @@
 # config valid only for current version of Capistrano
-lock "3.10.0"
+lock "3.11.0"
 
 require 'yaml'
 opts = YAML.load_file('config/definitions.yml')

data/base/config/deploy/production.rb

@@ -5,6 +5,7 @@ opts = YAML.load_file('config/definitions.yml')
 db_info = YAML.load_file('config/database.yml')
 
 deploy_user = opts['deployer']['user']
+deploy_group = opts['deployer']['www_data_group']
 host_addr = opts['deployer']['host']['production']
 multisite_root = opts['deployer']['root']
 site_fqdn = opts['deployer']['fqdn']['production']
@@ -79,7 +80,10 @@ namespace :deploy do
   desc 'Finds and replaces localhost:8000 and your Staging address with the Production address'
   task :chikan do
     on roles(:web) do
-      puts 'Replacing localhost:8000 and Staging URLs with Production URLs...'
+      puts 'Replacing localhost:8000 and Production URLs with Staging URLs...'
+
+      # Set an anchor to first homogonize instances of URL's, then replace all the anchors
+      anchor = "URL_REPLACEMENT_ANCHOR_00000"
 
       # Create a backup, download it, and remove remote copy
       execute "mkdir -p #{deploy_path}/db/tmp"
@@ -91,18 +95,45 @@ namespace :deploy do
       # Regex replace in file
       db_data = File.read('db/tmp/wordpress.sql')
 
-      db_data = db_data.gsub(/localhost:8000/, "#{opts['deployer']['fqdn']['production']}")
+      # This may seem roundabout, but in order to avoid mangling the target URL we need to first
+      # 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']}/, "#{opts['deployer']['fqdn']['production']}")
+        db_data = db_data.gsub(/#{opts['deployer']['fqdn']['staging']}/, anchor)
       end
 
+      # Set localhost entries to the anchor
+      db_data = db_data.gsub(/localhost\%3A8000/, anchor)
+      db_data = db_data.gsub(/localhost:8000/, anchor)
+
+      # Replace anchors with the correct target URL
+      db_data = db_data.gsub(anchor, "#{opts['deployer']['fqdn']['production']}")
+
+      # Save results
       File.open('db/tmp/wordpress.sql', "w") {|file| file.puts db_data }
 
       # Upload file and seed
       upload! 'db/tmp/wordpress.sql', "#{deploy_path}/db/tmp/wordpress.sql"
       execute "mysql -h#{db_info['production']['host']} -u#{db_info['production']['username']} -p#{db_info['production']['password']} #{db_info['production']['database']} < #{deploy_path}/db/tmp/wordpress.sql"
       execute "rm #{deploy_path}/db/tmp/*.sql"
-      `rm db/tmp/wordpress.sql`
+
+      # Remove work file
+      # `rm db/tmp/wordpress.sql`
+    end
+  end
+
+  desc 'Sets ownership permissions'
+  task :set_permissions do
+    on roles(:web) do
+      puts 'Setting permissions'
+      if deploy_group != nil
+        puts "Recrusively setting group to #{deploy_group}..."
+        execute "chown -R :#{deploy_group} #{deploy_path}"
+        puts 'Allowing group level Write permission...'
+        execute "chmod -R g+w #{deploy_path}"
+      end
     end
   end
 
@@ -125,17 +156,19 @@ namespace :deploy do
       invoke('deploy')
       invoke('db:seed')
       invoke('deploy:chikan')
+      invoke('deploy:set_permissions')
     end
   end
 
   desc 'Clear out remote DB tables and delete all remote files in deploy target directory'
   task :destruct do
     on roles(:web) do
-      execute "mysqldump --opt --user=#{db_info['production']['username']} " \
+      execute "mysql --user=#{db_info['production']['username']} " \
+        "--password=#{db_info['production']['password']} --host=#{db_info['production']['host']} " \
+        "-Nse 'show tables' #{db_info['production']['database']} | " \
+        "while read table; do echo \"drop table $table;\"; done | " \
+        "mysql --user=#{db_info['production']['username']} " \
         "--password=#{db_info['production']['password']} --host=#{db_info['production']['host']} " \
-        "--add-drop-table --no-data #{db_info['production']['database']} | " \
-        "grep -e '^DROP \| FOREIGN_KEY_CHECKS' | mysql -u#{db_info['production']['username']} " \
-        "-p#{db_info['production']['password']} -h#{db_info['production']['host']} " \
         "#{db_info['production']['database']}"
 
       execute "rm -rf #{deploy_path}/*"
@@ -181,6 +214,7 @@ namespace :data do
       download! "#{deploy_path}/shared/public/wp-content/uploads", "./public/wp-content/", recursive: true
       download! "#{deploy_path}/shared/public/wp-content/plugins", "./public/wp-content/", recursive: true
       download! "#{deploy_path}/shared/public/wp-content/upgrade", "./public/wp-content/", recursive: true
+      download! "#{deploy_path}/current/public/wp-content/themes", "./public/wp-content/", recursive: true
     end
   end
 
@@ -191,6 +225,7 @@ namespace :data do
       `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/shared/public/wp-content/uploads/ ./public/wp-content/uploads/`
       `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/shared/public/wp-content/plugins/ ./public/wp-content/plugins/`
       `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/shared/public/wp-content/upgrade/ ./public/wp-content/upgrade/`
+      `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/current/public/wp-content/themes/ ./public/wp-content/themes/`
     end
   end
 end

data/base/config/deploy/staging.rb

@@ -5,6 +5,7 @@ opts = YAML.load_file('config/definitions.yml')
 db_info = YAML.load_file('config/database.yml')
 
 deploy_user = opts['deployer']['user']
+deploy_group = opts['deployer']['www_data_group']
 host_addr = opts['deployer']['host']['staging']
 multisite_root = opts['deployer']['root']
 site_fqdn = opts['deployer']['fqdn']['staging']
@@ -81,6 +82,9 @@ namespace :deploy do
     on roles(:web) do
       puts 'Replacing localhost:8000 and Production URLs with Staging URLs...'
 
+      # Set an anchor to first homogonize instances of URL's, then replace all the anchors
+      anchor = "URL_REPLACEMENT_ANCHOR_00000"
+
       # Create a backup, download it, and remove remote copy
       execute "mkdir -p #{deploy_path}/db/tmp"
       execute "mysqldump --opt --user=#{db_info['staging']['username']} --password=#{db_info['staging']['password']} --host=#{db_info['staging']['host']} #{db_info['staging']['database']} > #{deploy_path}/db/tmp/wordpress.sql"
@@ -91,18 +95,45 @@ namespace :deploy do
       # Regex replace in file
       db_data = File.read('db/tmp/wordpress.sql')
 
-      db_data = db_data.gsub(/localhost:8000/, "#{opts['deployer']['fqdn']['staging']}")
+      # This may seem roundabout, but in order to avoid mangling the target URL we need to first
+      # replace instances of it with something that won't match
+      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']}/, "#{opts['deployer']['fqdn']['staging']}")
+        db_data = db_data.gsub(/#{opts['deployer']['fqdn']['production']}/, anchor)
       end
 
+      # Set localhost entries to the anchor
+      db_data = db_data.gsub(/localhost\%3A8000/, anchor)
+      db_data = db_data.gsub(/localhost:8000/, anchor)
+
+      # Replace anchors with the correct target URL
+      db_data = db_data.gsub(anchor, "#{opts['deployer']['fqdn']['staging']}")
+
+      # Save results
       File.open('db/tmp/wordpress.sql', "w") {|file| file.puts db_data }
 
       # Upload file and seed
       upload! 'db/tmp/wordpress.sql', "#{deploy_path}/db/tmp/wordpress.sql"
       execute "mysql -h#{db_info['staging']['host']} -u#{db_info['staging']['username']} -p#{db_info['staging']['password']} #{db_info['staging']['database']} < #{deploy_path}/db/tmp/wordpress.sql"
       execute "rm #{deploy_path}/db/tmp/*.sql"
-      `rm db/tmp/wordpress.sql`
+
+      # Remove work file
+      # `rm db/tmp/wordpress.sql`
+    end
+  end
+
+  desc 'Sets ownership permissions'
+  task :set_permissions do
+    on roles(:web) do
+      puts 'Setting permissions'
+      if deploy_group != nil
+        puts "Recrusively setting group to #{deploy_group}..."
+        execute "chown -R :#{deploy_group} #{deploy_path}"
+        puts 'Allowing group level Write permission...'
+        execute "chmod -R g+w #{deploy_path}"
+      end
     end
   end
 
@@ -125,17 +156,19 @@ namespace :deploy do
       invoke('deploy')
       invoke('db:seed')
       invoke('deploy:chikan')
+      invoke('deploy:set_permissions')
     end
   end
 
   desc 'Clear out remote DB tables and delete all remote files in deploy target directory'
   task :destruct do
     on roles(:web) do
-      execute "mysqldump --opt --user=#{db_info['staging']['username']} " \
+      execute "mysql --user=#{db_info['staging']['username']} " \
+        "--password=#{db_info['staging']['password']} --host=#{db_info['staging']['host']} " \
+        "-Nse 'show tables' #{db_info['staging']['database']} | " \
+        "while read table; do echo \"drop table $table;\"; done | " \
+        "mysql --user=#{db_info['staging']['username']} " \
         "--password=#{db_info['staging']['password']} --host=#{db_info['staging']['host']} " \
-        "--add-drop-table --no-data #{db_info['staging']['database']} | " \
-        "grep -e '^DROP \| FOREIGN_KEY_CHECKS' | mysql -u#{db_info['staging']['username']} " \
-        "-p#{db_info['staging']['password']} -h#{db_info['staging']['host']} " \
         "#{db_info['staging']['database']}"
 
       execute "rm -rf #{deploy_path}/*"
@@ -181,6 +214,7 @@ namespace :data do
       download! "#{deploy_path}/shared/public/wp-content/uploads", "./public/wp-content/", recursive: true
       download! "#{deploy_path}/shared/public/wp-content/plugins", "./public/wp-content/", recursive: true
       download! "#{deploy_path}/shared/public/wp-content/upgrade", "./public/wp-content/", recursive: true
+      download! "#{deploy_path}/current/public/wp-content/themes", "./public/wp-content/", recursive: true
     end
   end
 
@@ -191,6 +225,7 @@ namespace :data do
       `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/shared/public/wp-content/uploads/ ./public/wp-content/uploads/`
       `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/shared/public/wp-content/plugins/ ./public/wp-content/plugins/`
       `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/shared/public/wp-content/upgrade/ ./public/wp-content/upgrade/`
+      `rsync -avzPhu --delete #{deploy_user}@#{host_addr}:#{deploy_path}/current/public/wp-content/themes/ ./public/wp-content/themes/`
     end
   end
 end

data/templates/config/definitions.yml

@@ -1,5 +1,7 @@
 deployer:
-  user: 
+  user:
+  # Uncomment this line if you are not on a shared host/if your web server runs under a different user than what you specified in the user field above
+  # www_data_group: www-data
   host:
     staging: 
     production: 

data/wslave.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'wslave'
-  s.version     = '0.0.17'
+  s.version     = '0.0.18'
   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,10 +20,11 @@ Gem::Specification.new do |s|
   s.bindir = 'bin'
   s.executables << 'wslave'
 
-  s.add_dependency 'capistrano', '= 3.10.0'
-  s.add_dependency 'capistrano-git-with-submodules', '~> 2.0'
-  s.add_dependency 'capistrano-scm-copy', '~> 0.7'
+  s.add_dependency 'capistrano', '= 3.11.0'
+  s.add_dependency 'capistrano-git-with-submodules', '~> 2.0', '2.0.3'
+  s.add_dependency 'capistrano-scm-copy', '~> 0.7', '0.7.0'
+  s.add_dependency 'capistrano-file-permissions', '~> 1.0', '1.0.0'
 
-  s.add_dependency 'thor', '~> 0.20'
-  s.add_dependency 'haikunator', '~> 1.1'
+  s.add_dependency 'thor', '~> 0.20', '0.20.0'
+  s.add_dependency 'haikunator', '~> 1.1', '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wslave
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2018-06-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.10.0
+        version: 3.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: capistrano-git-with-submodules
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: capistrano-scm-copy
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +51,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +61,29 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: capistrano-file-permissions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +91,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +101,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: haikunator
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +111,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +121,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: Word Slave includes the wslave command and a control library to generate
   a "best practice" WordPress installation and includes a pre-rolled Docker setup
   for running a development server and a Capistrano setup for deployment.
@@ -89,16 +133,18 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- base/.gitignore
 - base/Capfile
 - base/Dockerfile
 - base/Gemfile
 - base/Rakefile
+- base/config/deploy-tools/gen-nginx-vhost.rb
 - base/config/deploy-tools/gen-salts.rb
 - base/config/deploy-tools/gen-wp-config.rb
+- base/config/deploy-tools/nginx.vhost.erb
 - base/config/deploy-tools/wp-config.php.erb
 - base/config/deploy-tools/wp-config.php.local
 - base/config/deploy.rb
-- base/config/deploy/.production.rb.swp
 - base/config/deploy/production.rb
 - base/config/deploy/staging.rb
 - base/docker-compose.yml
@@ -134,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: '"Word Slave" generates and controls a WordPress installation'