@fishawack/lab-env 4.25.3 → 4.27.0

package/commands/create/templates/elasticbeanstalk/.platform/hooks/predeploy/deactivate-plugins.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+set -e
+
+# Exit out if no current folder exists as that means this is a brand new instance
+if [ ! -d "/var/app/current/" ]; then
+  echo "New instance - skipping as no existing web dir exists"
+  exit 0;
+fi
+
+INSTANCE_ID=`curl http://169.254.169.254/latest/meta-data/instance-id 2>/dev/null`
+REGION=`curl -s http://169.254.169.254/latest/dynamic/instance-identity/document 2>/dev/null | jq -r .region`
+AWSARG="--region $REGION --output json"
+
+# Get elastic beanstalk environment name
+ENVNAME=`aws ec2 describe-tags --filters "Name=resource-id,Values=$INSTANCE_ID" $AWSARG | jq -r '.[][] | select(.Key=="elasticbeanstalk:environment-name") | .Value'`
+
+# Get last 25 elastic beanstalk events
+EVENTS=`aws elasticbeanstalk describe-events --environment-name $ENVNAME --max-items 25 $AWSARG`
+
+# Find create event for Batch 2 and grab the first instance modified from its message
+PREEXISTING_INSTANCE_ID=''
+while read i ; do
+    if [[ $i == *"Batch 2: Starting application deployment on instance(s)"* ]]; then
+        PREEXISTING_INSTANCE_ID=$(echo $i | cut -d "[" -f2 | cut -d "]" -f1 | cut -d "," -f1)
+        break
+    fi
+done <<< "$(echo $EVENTS | jq -rc '.Events[].Message')"
+
+# Exit out if current instance is not the pre-existing instance
+if [ "$INSTANCE_ID" != "$PREEXISTING_INSTANCE_ID" ]; then
+  echo "$INSTANCE_ID doesn't match the pre-existing instance id $PREEXISTING_INSTANCE_ID - skipping check for plugins"
+  exit 0;
+fi
+
+# Get a list of plugins from the current dir and staging dir for comparison
+PREVPLUGINS=$(cd /var/app/current/; wp plugin list --fields=name --format=json) || echo "{}"
+CURRENTPLUGINS=$(cd /var/app/staging/; wp plugin list --fields=name --format=json) || echo "{}"
+
+# Loop through current plugins and check if they still exist in the staging dir - otherwise add them to the missing list
+MISSING=''
+for i in `echo $PREVPLUGINS | jq -rc '.[].name'`; do
+  if [ $(echo $CURRENTPLUGINS | jq -rc "any(.[]; .name == \"$i\")") == "false" ]; then
+      MISSING="${MISSING} $i"
+  fi
+done
+
+# Exit out if no missing plugins
+if [ -z "$MISSING" ]; then
+  echo "No missing plugins - skipping deactivation"
+  exit 0;
+fi
+
+# Deactivate missing plugins
+(cd /var/app/current/; wp plugin deactivate $MISSING)

package/commands/create/templates/elasticbeanstalk/.platform/httpd/conf.d/elasticbeanstalk/80/forward-https-proto.conf

@@ -0,0 +1,3 @@
+<IfModule mod_setenvif.c>
+  SetEnvIf X-Forwarded-Proto "^https$" HTTPS
+</IfModule>

package/commands/create/templates/elasticbeanstalk/.platform/httpd/conf.d/elasticbeanstalk/z-wordpress-htpasswd.conf

@@ -0,0 +1,13 @@
+<Directory /var/www/html/wordpress>
+    AuthName "Restricted Content"
+    AuthType Basic
+    AuthUserFile /etc/httpd/conf.d/elasticbeanstalk/.htpasswd
+    Require valid-user
+    ErrorDocument 401 "401 Unauthorized"
+</Directory>
+
+<Directory /var/www/html/wordpress/wp-content/themes/fishawack/>
+    <Files "health.html">
+        Require all granted
+    </Files>
+</Directory>

package/commands/create/templates/elasticbeanstalk/.platform/httpd/conf.d/security_headers-wordpress.conf

@@ -0,0 +1,11 @@
+Header set X-Content-Type-Options "nosniff"
+Header set Content-Security-Policy "default-src 'self' https: data: 'unsafe-inline' 'unsafe-eval';"
+Header set X-Frame-Options 'sameorigin'
+Header set Strict-Transport-Security "max-age=31536000; includeSubDomains"
+
+ServerSignature Off
+ServerTokens Prod
+
+<Files "xmlrpc.php">
+  Require all denied
+</Files>

package/commands/create/templates/elasticbeanstalk/.platform/nginx/conf.d/elasticbeanstalk/health.conf

@@ -0,0 +1,4 @@
+location /health {
+    return 200 'ok';
+    add_header Content-Type text/plain;
+}

package/commands/create/templates/elasticbeanstalk/.platform/nginx/conf.d/elasticbeanstalk/htpasswd.conf

@@ -0,0 +1,2 @@
+auth_basic "Restricted Content";
+auth_basic_user_file /etc/nginx/conf.d/elasticbeanstalk/.htpasswd;

package/globals.js

@@ -52,6 +52,8 @@ try{
     repo = path.basename(cwd);
 }
 
+process.env.REPO = repo;
+
 const repo_safe = repo.replace(/\./g, '');
 
 try{ pkg = require(path.join(cwd, 'package.json')); } catch(e){}
@@ -146,6 +148,8 @@ process.env.FW_CORE_1_TARGET_IMAGE = process.env.FW_CORE_1_TARGET_IMAGE || (proc
 process.env.FW_CORE_1_TARGET = process.env.FW_CORE_1_TARGET || (process.env.FW_FULL ? "full" : "alpine");
 process.env.FW_CORE_1_IMAGE = process.env.FW_CORE_1_IMAGE || `fishawack/lab-env-core-1${process.env.FW_CORE_1_TARGET_IMAGE}`;
 
+process.env.FW_LARAVEL_8_NGINX_IMAGE = process.env.FW_LARAVEL_8_NGINX_IMAGE || `fishawack/lab-env-laravel-8-nginx`;
+
 var core = `-f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml`;
 
 // Map versions of images
@@ -171,6 +175,15 @@ if(existsSync(path.join(contextOverride, 'Dockerfile'))){
     process.env.FW_CORE_1_IMAGE += `-${repo_safe}`;
 }
 
+process.env.FW_LARAVEL_8_NGINX_CONTEXT = process.env.FW_LARAVEL_8_NGINX_CONTEXT || `${__dirname}/laravel/8/nginx/`;
+
+contextOverride = path.join(cwd, '_Docker/laravel/8/nginx');
+if(existsSync(path.join(contextOverride, 'Dockerfile'))){
+    process.env.FW_LARAVEL_8_NGINX_CONTEXT = contextOverride;
+    process.env.FW_LARAVEL_8_NGINX_IMAGE += `-${repo_safe}`;
+    process.env.FW_LARAVEL_8_NGINX_VERSION = require(`${contextOverride}/package.json`).version;
+}
+
 if(existsSync(path.join(cwd, '.env.example')) && !existsSync(path.join(cwd, '.env'))){
     copyFileSync(path.join(cwd, '.env.example'), path.join(cwd, '.env'));
 }

package/laravel/9/docker-compose.yml

@@ -14,9 +14,9 @@ services:
       - mysql:/var/lib/mysql
   nginx:
     build: 
-      context: $DIRNAME/laravel/8/nginx/
+      context: $FW_LARAVEL_8_NGINX_CONTEXT
       target: development
-    image: fishawack/lab-env-laravel-8-nginx:${FW_LARAVEL_8_NGINX_VERSION:-latest}
+    image: $FW_LARAVEL_8_NGINX_IMAGE:${FW_LARAVEL_8_NGINX_VERSION:-latest}
     networks:
       - default
     volumes:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "4.25.3",
+  "version": "4.27.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {
@@ -23,15 +23,20 @@
   },
   "dependencies": {
     "@aws-sdk/client-cloudfront": "^3.141.0",
+    "@aws-sdk/client-ec2": "^3.399.0",
+    "@aws-sdk/client-elastic-beanstalk": "^3.395.0",
     "@aws-sdk/client-iam": "^3.150.0",
     "@aws-sdk/client-s3": "^3.141.0",
+    "apache-md5": "^1.1.8",
     "axios": "^0.21.4",
     "chalk": "4.1.0",
+    "fs-extra": "^11.1.1",
     "generate-password": "^1.7.0",
     "get-port": "5.1.1",
     "git-branch": "^2.0.1",
     "glob": "7.1.7",
     "inquirer": "8.1.2",
+    "lodash": "^4.17.21",
     "nodemailer": "^6.7.8",
     "ora": "5.4.1",
     "semver": "7.3.4",