wslave 0.3.6 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8daaa212535c1ecfa77f8e58081ee01f28c89d95c782dda2e6e31a608c17364f
-  data.tar.gz: f8661cfe1d3a1a190a99a5fca0f50c5be41e081637fcf81866a798e1ab56488c
+  metadata.gz: ae8f5b776137111cf2c79936a1f7bc17126fe3a884441865cf5fa8895305a9ee
+  data.tar.gz: 9a604e9920dd201fec828720230c61036d933ac17625824f8148590864038ee0
 SHA512:
-  metadata.gz: 2ede25542d1264752be2659c8098c847dd53b65bb696fe1a6c24be291020bc0465555262b026059c249046967f32b5cf762919b3cc55cf9c77e332ee19cead1f
-  data.tar.gz: fdaa5e5762f5edb5f09c4264ae45a3f61594272f954e198d4bbfdca8b7743bd0f83ec33d041e46370c97238dbe71997f5dd1f0a769d4043bc3e4f6c5e3b05f1b
+  metadata.gz: 5cd61b1d6aed6bde6295cd27bc6d268373cb9e2a63ffc35dfaad03fb209395d209a95d45944f66eb24c588c508f546b944b2b6afb820f89fac5e960c0b36064c
+  data.tar.gz: 108c3f32c3fd2b2671889002f003a9c866e3a03f3757b75eac0863fad877bffbec35e660f7f31390e25a41d3a603b84b375022e4b9df2237f2f790b54acbd91d

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']
@@ -137,10 +137,10 @@ namespace :deploy do
     end
   end
 
-  desc 'Finds and replaces localhost:8000 and your Staging address with the Production address'
+  desc 'Finds and replaces localhost:8000 / localhost:8001and your Staging address with the Production address'
   task :chikan do
     on roles(:web) do
-      puts 'Replacing localhost:8000 and Production URLs with Staging URLs...'
+      puts 'Replacing localhost:8000 / localhost:8001 and Staging URLs with Production URLs...'
 
       # Set an anchor to first homogonize instances of URL's, then replace all the anchors
       anchor = "URL_REPLACEMENT_ANCHOR_00000"
@@ -159,14 +159,16 @@ 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
       db_data = db_data.gsub(/localhost\%3A8000/, anchor)
       db_data = db_data.gsub(/localhost:8000/, anchor)
+      db_data = db_data.gsub(/localhost\%3A8001/, anchor)
+      db_data = db_data.gsub(/localhost:8001/, anchor)
 
       # Replace anchors with the correct target URL
       db_data = db_data.gsub(anchor, "#{opts['deployer']['fqdn']['production']}")
@@ -197,6 +199,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 +232,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']
@@ -137,10 +137,10 @@ namespace :deploy do
     end
   end
 
-  desc 'Finds and replaces localhost:8000 and your Production address with the Staging address'
+  desc 'Finds and replaces localhost:8000 / localhost:8001 and your Production address with the Staging address'
   task :chikan do
     on roles(:web) do
-      puts 'Replacing localhost:8000 and Production URLs with Staging URLs...'
+      puts 'Replacing localhost:8000 / localhost:8001 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"
@@ -167,6 +167,8 @@ namespace :deploy do
       # Set localhost entries to the anchor
       db_data = db_data.gsub(/localhost\%3A8000/, anchor)
       db_data = db_data.gsub(/localhost:8000/, anchor)
+      db_data = db_data.gsub(/localhost\%3A8001/, anchor)
+      db_data = db_data.gsub(/localhost:8001/, anchor)
 
       # Replace anchors with the correct target URL
       db_data = db_data.gsub(anchor, "#{opts['deployer']['fqdn']['staging']}")
@@ -197,6 +199,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 +232,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

@@ -2,7 +2,7 @@
 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:7.4-apache
+FROM php:8.1-apache
 
 RUN a2enmod rewrite
 RUN service apache2 restart

data/base/docker/nginx/Dockerfile

@@ -1,27 +1,47 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get update && apt-get dist-upgrade -y
 RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
-# NOTE: When the PHP FPM version changes, you MUST update the 
-#  version named in base/docker/nginx/supervisord.conf and
-#  in base/docker/nginx/nginx.vhost, then rebuild the nweb image!
-RUN apt-get install -y nginx php7.4-fpm php-mysql \
-	php7.4-mbstring php7.4-curl php7.4-dom php7.4-exif php7.4-fileinfo \
-	php7.4-json php7.4-imagick php7.4-xml php7.4-zip php7.4-iconv \
+
+RUN apt-get install -y nginx php-fpm php-mysql \
+	php-mbstring php-curl php-dom \
+	php-imagick php-xml php-zip \
+	composer nodejs npm \
 	libpng-dev libjpeg-dev \
 	mariadb-client mariadb-common \
-	supervisor curl
+	supervisor curl less neovim emacs
 RUN apt-get clean
-RUN adduser www-data root
+
 RUN mkdir /db \
-&& chmod 777 /db
+	&& chmod 777 /db
 
 COPY nginx.vhost /etc/nginx/sites-enabled/default
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY php.ini /etc/php/7.4/fpm/php.ini
+
+# NOTE: When the PHP FPM version changes, you MUST change the
+#   version definition right below this comment, then you must
+#   rebuild the nweb image!
+ARG PHP_FPM_VERSION=8.1
+RUN mkdir -p /run/php
+COPY php.ini /etc/php/$PHP_FPM_VERSION/fpm/php.ini
+RUN ln -s /usr/sbin/php-fpm$PHP_FPM_VERSION /usr/sbin/php-fpm
+RUN ln -s /run/php/php$PHP_FPM_VERSION-fpm.sock /run/php/php-fpm.sock
+RUN ln -s /run/php/php$PHP_FPM_VERSION-fpm.pid /run/php/php-fpm.pid
+
+RUN npm install yarn -g
+
+# The lines below install wp-cli in the container. However, since
+#	wp-cli is run as root it causes various permission problems. In 
+#	the future this may be re-added with some method of correcting 
+#	permissions. Until then, please use wp-cli locally.
+#RUN curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -o /usr/local/bin/wp
+#RUN chmod +x /usr/local/bin/wp
+#RUN mkdir /root/.wp-cli
+#COPY wp-cli.yml /root/.wp-cli/config.yml
+#RUN echo 'alias wp="wp --allow-root"' >>  /root/.bashrc
 
 RUN ln -sf /dev/stdout /var/log/nginx/access.log \
-    && ln -sf /dev/stderr /var/log/nginx/error.log
+	&& ln -sf /dev/stderr /var/log/nginx/error.log
 
 EXPOSE 80
 

data/base/docker/nginx/nginx.vhost

@@ -30,7 +30,7 @@ server {
 
       rewrite ^/index\.php$ /wordpress/index.php last;
       include snippets/fastcgi-php.conf;
-      fastcgi_pass unix:/run/php/php7.4-fpm.sock;
+      fastcgi_pass unix:/run/php/php-fpm.sock;
     }
 
     try_files $uri $uri/ /index.php?$args;