wslave 0.3.4 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8a86816c5dce9a8b16b04e35e90d683767d59a98805e49b8fd23b89eb144ae1
-  data.tar.gz: a0e1a81ccf6c92c79a3fce088afc2de607614af094df7135abcb0f076a7702d4
+  metadata.gz: 839a62b6aacc39ae8b94d9754c086051fdf2a3e4d77b2204fd203bbfea03d0b7
+  data.tar.gz: 76651142c622cf53d06ce8a752c5f9b510682c1367af08a635e311bd4c9cdc7e
 SHA512:
-  metadata.gz: 1bf3ecc124a7536421152f5dd1630e65bf3c8619ed5139327739333372dfbb6125a1ab711266fd9fefc0fd2e8524be455e973633fae5cdd435c154420a7f6b0a
-  data.tar.gz: '05931783442e5ffa86c899aa48352c5a93f3a4d43bea20005871cb7b01ab3e0b3ee0e92fb2d38bafc9f7c57d46f58d720142133f91f4175232ee4bc2d5c0f1c8'
+  metadata.gz: a9a20502e3ffd6698d6edf29cf7ea5097a5ac123c0abeaa285c42285387fad9603b7483a2b1c5eaaa0724b3e4440a6da1964e98f05d2aa81ad345be791d2022e
+  data.tar.gz: 0cac7f0290283ccc147dd06c4975865cf26d1a9cec2a8c48210b96a63b166410f9d1a4ee027c6261dbefb3d968b85328eeee7776d6cc0558932137d0c8b92607

data/base/.gitignore

@@ -1,5 +1,5 @@
 log
-.swp
-.swo
+*.swp
+*.swo
 db/tmp/*
 .vscode

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']

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']

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-tools/nginx.vhost.erb

@@ -12,7 +12,10 @@ server {
   index index.php;
 
   location / {
-    rewrite ^/(wp-(admin|includes).*) /wordpress/$1 last;
+    rewrite ^/wp-admin$ /wordpress/wp-admin/ redirect;
+    rewrite ^/wp-admin/(.*) /wordpress/wp-admin/$1 redirect;
+
+    rewrite ^/wp-includes/(.*) /wordpress/wp-includes/$1 last;
 
     rewrite ^/$ /wordpress/index.php last;
 
@@ -20,10 +23,9 @@ server {
       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] %>;
+        rewrite ^/index\.php$ /wordpress/index.php last;
+        include snippets/fastcgi-php.conf;
+        fastcgi_pass unix:<%= server[:php_sock_path] %>;
       }
 
     try_files $uri $uri/ /index.php?$args;
@@ -35,9 +37,14 @@ server {
     log_not_found off;
   }
 
+  # Don't allow PHP to be run from the uploads folder (common attack vector)
+  location ~* /(?:uploads|files|wp-content\/uploads|wp-content\/files)/.*\.php$ {
+    deny all;
+  }
+
   location /wp-json/ { # Resolves WP Gutenberg 404 issue
     try_files $uri $uri/ /index.php;
-  } 
+  }
 
   location ~* \.(blade\.php)$ {
     deny all;
@@ -56,4 +63,4 @@ server {
   }
 
   client_max_body_size 4096M;
-} 
+}

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/docker/apache/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.0-apache
+FROM php:7.4-apache
 
 RUN a2enmod rewrite
 RUN service apache2 restart

data/base/docker/nginx/nginx.vhost

@@ -1,15 +1,25 @@
 server {
-  listen 80;
-  listen [::]:80;
+  listen 8001 default_server;
+  listen [::]:8001;
 
-  server_name testing wsalve-nginx;
+  server_name _;
+
+  port_in_redirect on; # Keeps the 8001 in redirects for better local development
 
   root /var/www/html;
 
   index index.php;
 
+  rewrite ^http://$host/.* http://$host:$server_port$request_uri;
+  rewrite ^http://$host:$server_port/wp-admin$ http://$host:$server_port/wordpress/wp-admin/;
+
+  proxy_set_header Host $host:$server_port;
+
   location / {
-    rewrite ^/(wp-(admin|includes).*) /wordpress/$1 last;
+    rewrite ^/wp-admin$ /wordpress/wp-admin/ redirect;
+    rewrite ^/wp-admin/(.*) /wordpress/wp-admin/$1 redirect;
+
+    rewrite ^/wp-includes/(.*) /wordpress/wp-includes/$1;
 
     rewrite ^/$ /wordpress/index.php last;
 
@@ -17,10 +27,10 @@ server {
       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:/run/php/php7.4-fpm.sock;
+
+      rewrite ^/index\.php$ /wordpress/index.php last;
+      include snippets/fastcgi-php.conf;
+      fastcgi_pass unix:/run/php/php7.4-fpm.sock;
     }
 
     try_files $uri $uri/ /index.php?$args;
@@ -32,9 +42,13 @@ server {
     log_not_found off;
   }
 
+  location ~* /(?:uploads|files|wp-content\/uploads|wp-content\/files)/.*\.php$ {
+    deny all;
+  }
+
   location /wp-json/ { # Resolves WP Gutenberg 404 issue
     try_files $uri $uri/ /index.php;
-  } 
+  }
 
   location ~* \.(blade\.php)$ {
     deny all;
@@ -52,5 +66,5 @@ server {
     deny all;
   }
 
-  client_max_body_size 4096M;
-} 
+  client_max_body_size 0;
+}

data/base/docker-compose.yml

@@ -1,8 +1,8 @@
-version: '3.7'
+version: '3.8'
 
 services:
   db:
-    image: mariadb:10.5-focal
+    image: mariadb:10.7-focal
     volumes:
       - "./db/dev:/db"
       - "./db/active:/docker-entrypoint-initdb.d"
@@ -27,7 +27,7 @@ services:
     volumes:
       - "./public:/var/www/html"
     ports:
-      - "8001:80"
+      - "8001:8001"
     environment:
       WORDPRESS_DB_HOST: db:3306
       WORDPRESS_DB_PASSWORD: wordpress

data/base/public/.htaccess

@@ -2,17 +2,24 @@
 	RewriteEngine On
 	RewriteBase /
 
+  # 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]
+
 	# Skip real files and directories
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
 
 	# Otherwise send it to WordPress
 	RewriteRule .* wordpress/index.php [L]
+
 # BEGIN WordPress
 # END WordPress
 </IfModule>
+
 <FilesMatch ".+\.(blade\.php)$">
     <IfModule mod_authz_core.c>
         # Apache 2.4
@@ -24,8 +31,6 @@
         Deny from all
     </IfModule>
 </FilesMatch>
-php_value upload_max_filesize 4096M
-php_value post_max_size 4096M
-php_value memory_limit 512M
-php_value max_execution_time 1200
-php_value max_input_time 2400
+
+php_value upload_max_filesize 0
+php_value post_max_size 0

data/base/public/wp-config.php

@@ -92,5 +92,10 @@ define('WP_CONTENT_URL', WP_HOME . '/wp-content');
 //define('WP_TEMP_DIR', realpath(ABSPATH . '../../tmp/'));
 define('FS_METHOD', 'direct');
 
+define('FORCE_SSL_ADMIN', false);
+define('FORCE_SSL_LOGIN', false);
+
+define('WP_CACHE', false);
+
 /** Sets up WordPress vars and included files. */
 require_once(ABSPATH . 'wp-settings.php');

data/bin/wslave

@@ -20,11 +20,18 @@ class WSlaveCLI < Thor
   option :version, default: '',
     desc: 'Specify the version, EG: "--version 5.3". To specify edge/development master use "--version edge".'
   option :wspath, default: '',
-    desc: 'specify the path to the wslave distribution, EG: "--wspath ../wslave".'
+    desc: 'specify the path to the wslave distribution, EG: "--wspath ../wslave".
+      NOTE: This is relative to the new app path.'
+  option :wppath, default: '',
+    desc: 'specify the path to a cloned git wordpress distribution, EG: "--wppath /shared/wordpress".
+      NOTE: This is relative to the new app path.
+      NOTE: If no data is found in this directory, wslave will clone the official WordPress repository here and 
+      copy it. Also, if there is data here that does not match the format of the official WordPress repository, 
+      most wslave functionality will probably be broken.'
   def new(path = './')
     require_relative '../lib/wslave_new'
     real_path = File.expand_path(path)
-    WSlaveNew.new(real_path, options['version'], options['wspath'])
+    WSlaveNew.new(real_path, options['version'], options['wspath'], options['wppath'])
   end
 
   desc 'update', "Updates toolchain"

data/lib/wslave_new.rb

@@ -6,7 +6,7 @@ require 'git'
 require_relative 'wslave_tools'
 
 class WSlaveNew
-  def initialize(path, version = '', wspath = '')
+  def initialize(path, version = '', wspath = '', wppath = '')
     puts '⚙ Initializing Toolchain・・・'
 
     if (wspath != '')
@@ -39,7 +39,21 @@ class WSlaveNew
 
     `cd #{path} && git init && git add --all && git commit -am "initial commit by wslave"`
 
-    `cd #{path} && git submodule add git://github.com/WordPress/WordPress.git public/wordpress`
+    if (wppath != '')
+      wppath = File.expand_path(wppath)
+      puts "  >> Checking wppath (#{wppath}) ..."
+      if (File.directory? wppath)
+        puts "  >> wppath is a folder. Copying..."
+        Dir.chdir path
+        FileUtils.cp_r wppath, "public/wordpress"
+        Dir.chdir "public/wordpress"
+        `git clean -fdx; git stash`
+        `git checkout master`
+        `git pull`
+      end
+    end
+
+    `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/lib/wslave_sage.rb

@@ -16,11 +16,14 @@ class WSlaveSage
     project_root = Dir.pwd
 
     puts "Creating Sage theme at public/wp-content/themes/#{name}"
-    `cd public/wp-content/themes && composer create-project roots/sage #{name} dev-master`
+    Dir.chdir "public/wp-content/themes"
+    `composer create-project roots/sage #{name}`
+    Dir.chdir name
+    `composer require roots/acorn`
 
     Dir.chdir project_root
     _write_wslave_sage_config(name)
-    _overwrite_sage_webpack_browsersync_config
+    # _overwrite_sage_webpack_browsersync_config # TODO: sageの更新でwebpack.mix.jsが出力されなくなっている様子
   end
 
   def update()

data/lib/wslave_tools.rb

@@ -11,20 +11,28 @@ class WSlaveTools
 
   def self.set_dev_perms(path = '.')
     begin
-      unless Dir.exist?("#{path}/public/wp-content/upgrade")
-        FileUtils.mkdir("#{path}/public/wp-content/upgrade")
-        FileUtils.touch("#{path}/public/wp-content/upgrade/.gitkeep")
+      unless Dir.exist?("#{path}/public/data")
+        FileUtils.mkdir("#{path}/public/data")
+        FileUtils.touch("#{path}/public/data/.gitkeep")
       end
+      FileUtils.chown(nil, 'www-data', "#{path}/public/data")
+      FileUtils.chmod(0775, "#{path}/public/data")
+
       FileUtils.chown(nil, 'www-data', "#{path}/public/wp-content/themes")
       FileUtils.chmod(0775, "#{path}/public/wp-content/themes")
+
       FileUtils.chown(nil, 'www-data', "#{path}/public/wp-content/uploads")
       FileUtils.chmod(0775, "#{path}/public/wp-content/uploads")
+
       FileUtils.chown(nil, 'www-data', "#{path}/public/wp-content/plugins")
       FileUtils.chmod(0775, "#{path}/public/wp-content/plugins")
+      
+      unless Dir.exist?("#{path}/public/wp-content/upgrade")
+        FileUtils.mkdir("#{path}/public/wp-content/upgrade")
+        FileUtils.touch("#{path}/public/wp-content/upgrade/.gitkeep")
+      end
       FileUtils.chown(nil, 'www-data', "#{path}/public/wp-content/upgrade")
       FileUtils.chmod(0775, "#{path}/public/wp-content/upgrade")
-      FileUtils.chown(nil, 'www-data', "#{path}/public/data")
-      FileUtils.chmod(0775, "#{path}/public/data")
 
       unless Dir.exist?("#{path}/db")
         FileUtils.mkdir("#{path}/db")
@@ -59,6 +67,7 @@ class WSlaveTools
       end
       FileUtils.chown(nil, 'www-data', "#{path}/db/production")
       FileUtils.chmod(0775, "#{path}/db/production")
+
     rescue Errno::EPERM
       puts "!!!WARNING!!! Your user does not belong to the www-data group!\n" \
         " >>> Unable to make folders writable for devlopment. <<<\n" \

data/lib/wslave_update.rb

@@ -24,6 +24,7 @@ class WSlaveUpdate
     FileUtils.cp_r("#{base_path}/docker", "#{path}/")
     FileUtils.cp("#{base_path}/docker-compose.yml", "#{path}/docker-compose.yml")
     FileUtils.cp("#{base_path}/public/.htaccess", "#{path}/public/.htaccess")
+    FileUtils.cp("#{base_path}/public/wp-config.php", "#{path}/public/wp-config.php")
     FileUtils.cp_r(Dir.glob("#{base_path}/config/*"), "#{path}/config")
     FileUtils.cp("#{template_path}/config/database.yml", "#{path}/config/database.yml") unless File.exist?  "#{path}/config/database.yml"
     FileUtils.cp("#{template_path}/config/definitions.yml", "#{path}/config/definitions.yml") unless File.exist?  "#{path}/config/definitions.yml"

data/wslave.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'wslave'
-  s.version     = '0.3.4'
+  s.version     = '0.3.7'
   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,13 +20,13 @@ 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'
 
-  s.add_dependency 'git', '~> 1.8', '1.8.1'
+  s.add_dependency 'git', '~> 1.10', '1.10.2'
 
-  s.add_dependency 'thor', '~> 1.1', '1.1.0'
+  s.add_dependency 'thor', '~> 1.2', '1.2.1'
   s.add_dependency 'haikunator', '~> 1.1', '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wslave
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.7
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2022-04-15 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
@@ -90,40 +90,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.10.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: haikunator
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,6 @@ files:
 - 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/.staging.rb.swp
 - base/config/deploy/production.rb
 - base/config/deploy/staging.rb
@@ -205,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: '"Word Slave" generates and controls a WordPress installation'