@fishawack/lab-env 4.19.0 → 4.21.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Changelog
 
+### 4.21.0 (2023-05-22)
+* [Feature] added elastic beanstalk config stubs
+* [Change] wp command now prepends vendor path in wordpress@1 and no longer passes path as its found in wp-cli yml
+* [Change] Bumped fishawack/lab-env-wordpress-1-php to 1.1.0
+
+### 4.20.0 (2023-05-19)
+* [Feature] added new clients
+
 ### 4.19.0 (2023-05-17)
 * [Feature] Added newly setup AWS accounts to the client prompts on `fw provision`
 

package/commands/create/services/aws/index.js

@@ -6,7 +6,7 @@ module.exports.iam = require("./iam.js");
 
 module.exports.slug = (repo, client, branch) => s3Safe(`${branch}-${repo}-${client}`);
 
-module.exports.clients = ['fishawack', 'abbvie', 'sanofigenzyme', 'gsk', 'janssen', 'astrazeneca', 'ptc', 'jazz', 'pfizer', 'heron', 'novartis', 'training', 'merck', 'acadia', 'travere', 'roche', 'utc', 'bayer', 'alcon', 'uhc', 'chiesi', '3m', 'sarepta', 'ipsen', 'novocure', 'anthem', 'kyowakirin', 'optum', 'rally', 'menarini'];
+module.exports.clients = ['fishawack', 'abbvie', 'sanofigenzyme', 'gsk', 'janssen', 'astrazeneca', 'ptc', 'jazz', 'pfizer', 'heron', 'novartis', 'training', 'merck', 'acadia', 'travere', 'roche', 'utc', 'bayer', 'alcon', 'uhc', 'chiesi', '3m', 'sarepta', 'ipsen', 'novocure', 'anthem', 'kyowakirin', 'optum', 'rally', 'menarini', 'childrensminnesota'];
 
 module.exports.static = async (name, account, tags = [], credentials = []) => {
     let s3 = await module.exports.s3.createS3Bucket(name, account, tags);

package/commands/create/templates/elasticbeanstalk/.ebextensions/apache/auto-ssl.config

@@ -0,0 +1,24 @@
+files: 
+  /etc/cron.d/certbot_renew: 
+    content: "@weekly root certbot renew\n"
+    group: root
+    mode: "000644"
+    owner: root
+    
+container_commands:
+  10_downloadepel: 
+    command: "wget -r --no-parent -A 'epel-release-*.rpm' https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/"
+  20_installepel: 
+    command: "rpm -Uvh dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/epel-release-*.rpm --force"
+  30_enableepl: 
+    command: "yum-config-manager --enable epel*"
+  40_installcertbot: 
+    command: "yum install -y certbot"
+  50_getcert: 
+    command: "certbot certonly --debug --non-interactive --email ${EMAIL_LINK} --agree-tos --standalone --expand --domains ${DOMAIN_LINK} --keep-until-expiring --pre-hook \"service httpd stop\""
+  60_link: 
+    command: "ln -sf /etc/letsencrypt/live/$(echo ${DOMAIN_LINK} | cut -d, -f1) /etc/letsencrypt/live/ebcert"
+  70_startserver:
+    command: "service httpd start"
+  80_cleanup: 
+    command: "rm -rf dl.fedoraproject.org"

package/commands/create/templates/elasticbeanstalk/.ebextensions/misc/alb-http-to-https-redirection.config

@@ -0,0 +1,40 @@
+###################################################################################################
+#### Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+####
+#### Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file
+#### except in compliance with the License. A copy of the License is located at
+####
+####     http://aws.amazon.com/apache2.0/
+####
+#### or in the "license" file accompanying this file. This file is distributed on an "AS IS"
+#### BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#### License for the specific language governing permissions and limitations under the License.
+###################################################################################################
+
+###################################################################################################
+#### This configuration file modifies the default port 80 listener attached to an Application Load Balancer 
+#### to automatically redirect incoming connections on HTTP to HTTPS.
+#### This will not work with an environment using the load balancer type Classic or Network.
+#### A prerequisite is that the 443 listener has already been created. 
+#### Please use the below link for more information about creating an Application Load Balancer on 
+#### the Elastic Beanstalk console.
+#### https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/environments-cfg-alb.html#environments-cfg-alb-console
+###################################################################################################
+
+Resources:
+ AWSEBV2LoadBalancerListener:
+  Type: AWS::ElasticLoadBalancingV2::Listener
+  Properties:
+    LoadBalancerArn:
+      Ref: AWSEBV2LoadBalancer
+    Port: 80
+    Protocol: HTTP
+    DefaultActions:
+      - Type: redirect
+        RedirectConfig:
+          Host: "#{host}"
+          Path: "/#{path}"
+          Port: "443"
+          Protocol: "HTTPS"
+          Query: "#{query}"
+          StatusCode: "HTTP_301"

package/commands/create/templates/elasticbeanstalk/.ebextensions/misc/enable-https.config

@@ -0,0 +1,13 @@
+Resources: 
+  sslSecurityGroupIngress: 
+    Properties: 
+      CidrIp: 0.0.0.0/0
+      FromPort: 443
+      GroupId: 
+        ? "Fn::GetAtt"
+        : 
+          - AWSEBSecurityGroup
+          - GroupId
+      IpProtocol: tcp
+      ToPort: 443
+    Type: "AWS::EC2::SecurityGroupIngress"

package/commands/create/templates/elasticbeanstalk/.ebextensions/misc/setvars.config

@@ -0,0 +1,6 @@
+commands:
+  setvars:
+    command: /opt/elasticbeanstalk/bin/get-config environment | jq -r 'to_entries | .[] | "export \(.key)=\"\(.value)\""' > /etc/profile.d/sh.local
+packages:
+  yum:
+    jq: []

package/commands/create/templates/elasticbeanstalk/.ebextensions/php/ini.config

@@ -0,0 +1,10 @@
+files:
+  "/etc/php.d/custom.ini":
+    mode: "000755"
+    owner: root
+    group: root
+    content: |
+      memory_limit = 500M
+      upload_max_filesize = 500M
+      post_max_size = 500M
+      max_execution_time = 600

package/commands/create/templates/elasticbeanstalk/.ebextensions/wordpress/environment.config

@@ -0,0 +1,3 @@
+option_settings:
+  - option_name: WP_CLI_ALLOW_ROOT 
+    value: true

package/commands/create/templates/elasticbeanstalk/.ebextensions/wordpress/post-deploy.config

@@ -0,0 +1,10 @@
+container_commands:
+  10-db-import:
+    command: if [ -f auto-ci-db.sql ]; then vendor/bin/wp db reset --yes; vendor/bin/wp db import auto-ci-db.sql; fi
+    leader_only: true
+  20-db-remove:
+    command: "rm -rf auto-ci-db.sql"
+  30-rewrite-flush:
+    command: "vendor/bin/wp rewrite flush --hard"
+  40-rewrite-flush:
+    command: "vendor/bin/wp cli cache clear"

package/commands/create/templates/elasticbeanstalk/.ebextensions/wordpress/software.config

@@ -0,0 +1,5 @@
+option_settings:
+  aws:elasticbeanstalk:container:php:phpini:
+    document_root: /wordpress
+  aws:elasticbeanstalk:environment:proxy:
+    ProxyServer: apache

package/commands/create/templates/elasticbeanstalk/.platform/httpd/conf.d/elasticbeanstalk/http-https-redirection.conf

@@ -0,0 +1,5 @@
+<VirtualHost *:80>
+    RewriteEngine On
+    RewriteCond %{HTTPS} off
+    RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
+</VirtualHost>

package/commands/create/templates/elasticbeanstalk/.platform/httpd/conf.d/ssl.conf

@@ -0,0 +1,10 @@
+Listen 443
+
+<VirtualHost *:443>
+    DocumentRoot /var/www/html/wordpress
+
+    SSLEngine on
+    SSLCertificateFile /etc/letsencrypt/live/ebcert/fullchain.pem
+    SSLCertificateKeyFile /etc/letsencrypt/live/ebcert/privkey.pem
+    SSLCertificateChainFile /etc/letsencrypt/live/ebcert/chain.pem
+</VirtualHost>

package/commands/wp.js

@@ -12,9 +12,9 @@ module.exports = [
             });
     },
     argv => _.up(() => {
-        const path = process.env.VERSION_WORDPRESS !== "0" ? '--path=./wordpress' : '';
         const container = process.env.VERSION_WORDPRESS !== "0" ? 'php' : 'wordpress';
+        const path = process.env.VERSION_WORDPRESS !== "0" ? 'vendor/bin/' : '';
 
-        _.command(container, `wp ${path} ${argv.command.join(' ')} --allow-root`);
+        _.command(container, `${path}wp ${argv.command.join(' ')} --allow-root`);
     })
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "4.19.0",
+  "version": "4.21.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {

package/wordpress/1/php/CHANGELOG.md

@@ -1,4 +1,7 @@
 ## Changelog
 
+### 1.1.0 (2023-05-22)
+* [Change] no longer install wp in image but through composer
+
 ### 1.0.0 (2023-03-22)
 * [Misc] initial commit

package/wordpress/1/php/Dockerfile

@@ -18,11 +18,6 @@ COPY ./policy.xml /etc/ImageMagick-6/policy.xml
 # Add php user
 RUN useradd -m -G www-data -s /bin/bash php
 
-# Install wordpress cli
-RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && \
-    chmod +x wp-cli.phar && \
-    mv wp-cli.phar /usr/local/bin/wp
-
 # Cleanup apt-get install folders
 RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

package/wordpress/1/php/package.json

@@ -1,6 +1,6 @@
 {
   "name": "php",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "lab-env docker config for the php module",
   "scripts": {
     "preversion": "docker login",