Changed local.settings.php to settings.local.php

.gitlab-ci.yml

@@ -13,7 +13,8 @@ variables:
 stages:
   - test
   - build
-  - deploy
+  - deploy-uat
+  - deploy-live
 
 code_standards:
   stage: test
@@ -58,9 +59,37 @@ custom_tests_d8:
     #- ../vendor/phpunit/phpunit/phpunit -c core/phpunit.xml.dist --group SITENAME
     - echo 'No custom unit tests currently, edit config if they are added'
 
-build:
+build-dev:
   stage: build
 
+  only:
+      - UAT
+
+  # this tells the build server to save these files between jobs, this keeps them to be deployed
+  artifacts:
+    paths:
+      - bin
+      - vendor
+      - web
+      - web/themes/custom/commerce_2_demo/css
+
+  script:
+    # Run Composer to build site (use --no-dev for production builds).
+    - composer install --no-interaction
+    # Compile Sass from theme.
+    - cd web/themes/custom/commerce_2_demo
+    - npm install
+    - gulp sass
+    # Remove the node_modules dir generated from npm install.
+    - rm -rf node_modules
+
+build-live:
+  stage: build
+
+  # NOTE: Master is also pushed to public accessible GitHub repo: https://github.com/AcroMedia/commerce-demo
+  only:
+    - master
+
   # this tells the build server to save these files between jobs, this keeps them to be deployed
   artifacts:
     paths:
@@ -70,20 +99,23 @@ build:
       - web/themes/custom/commerce_2_demo/css
 
   script:
+    # Run Composer to build site (use --no-dev for production builds).
     - composer install --no-interaction --no-dev
+    # Compile Sass from theme.
     - cd web/themes/custom/commerce_2_demo
     - npm install
     - gulp sass
+    # Remove the node_modules dir generated from npm install.
+    - rm -rf node_modules
 
-# Deploy STAGING site (AWS1).
-deploy-uat:
-  stage: deploy
+# Deploy base demo to STAGING site (AWS1).
+base-demo-to-uat:
+  stage: deploy-uat
   when: manual
 
   # add any other tags or branches you want here
   only:
-    - master
-    - guided_tours
+    - UAT
 
   environment:
     name: uat
@@ -107,23 +139,63 @@ deploy-uat:
     - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 
     #move updated files up to deployment server, exclude .git since it's not needed
-    - rsync -av --no-perms --no-owner --no-group --exclude '.git' /builds/acro/commerce-2-demo/ [email protected]:/home/commerce-2-demo/www/commerce-2-demo/
+    - rsync -av --no-perms --no-owner --no-group --exclude-from '.gitlabci-rsync-exclude.txt' --exclude '.git' --delete ./ [email protected]:/home/commerce-2-demo/www/commerce-2-demo/
 
     # log into the site and flush cache
-    - ssh [email protected] 'cd www/commerce-2-demo && composer install'
+    # IMPORTANT: Drupal 8.4 and Drush need PHP 7.1 but server defaults to 7.0. Need script to check PHP version and use the right one.
+    - ssh [email protected] '/bin/bash -u -e -s' < ./scripts/remote-drush-commands_base-uat.sh
 
-# Deploy CLIENT demo (CLOUD4 - manual deploy only).
-deploy-cloud4:
-  stage: deploy
+# Deploy plus demo to STAGING site (AWS1).
+plus-demo-to-uat:
+  stage: deploy-uat
   when: manual
 
   # add any other tags or branches you want here
+  only:
+    - UAT
+
+  environment:
+    name: uat
+    url: https://commerceplus.aws1.acrobuild.com
+
+  script:
+    # Install ssh-agent if not already installed, it is required by Docker
+    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+
+    # Run ssh-agent (inside the build environment)
+    - eval $(ssh-agent -s)
+
+    # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
+    - ssh-add <(echo "$DEPLOY_KEY_UAT")
+
+    # For Docker builds disable host key checking. Be aware that by adding that
+    # you are susceptible to man-in-the-middle attacks.
+    # WARNING: Use this only with the Docker executor, if you use it with shell
+    # you will overwrite your user's SSH config.
+    - mkdir -p ~/.ssh
+    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+
+    #move updated files up to deployment server, exclude .git since it's not needed
+    - rsync -av --no-perms --no-owner --no-group --exclude-from '.gitlabci-rsync-exclude.txt' --exclude '.git' --delete ./ [email protected]:/home/commerce-2-demo/www/commerceplus/
+
+    # log into the site and flush cache
+    # IMPORTANT: Drupal 8.4 and Drush need PHP 7.1 but server defaults to 7.0. Need script to check PHP version and use the right one.
+    - ssh [email protected] '/bin/bash -u -e -s' < ./scripts/remote-drush-commands_plus-uat.sh
+
+
+# Deploy base demo to LIVE site (CLOUD4).
+base-demo-to-live:
+  stage: deploy-live
+  when: manual
+
+  # add any other tags or branches you want here
+  # NOTE: Master is also pushed to public accessible GitHub repo: https://github.com/AcroMedia/commerce-demo
   only:
     - master
 
   environment:
     name: cloud4
-    url: https://demo.drupalcommerce.com
+    url: https://commercedemo.acromedia.com
 
   script:
     # Install ssh-agent if not already installed, it is required by Docker
@@ -143,8 +215,46 @@ deploy-cloud4:
     - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 
     # Install composer and move updated files up to deployment server, exclude .git since it's not needed
-    - rsync -av --no-perms --no-owner --no-group --exclude '.git' /builds/acro/commerce-2-demo/ [email protected]:/home/drupalcommerce/www/demo/
+    - rsync -av --no-perms --no-owner --no-group --exclude-from '.gitlabci-rsync-exclude.txt' --exclude '.git' --delete ./ [email protected]:/home/drupalcommerce/www/demo/
 
     # log into the site and flush cache
-    - ssh [email protected] 'cd www/demo/web && drush cr'
+    # IMPORTANT: Drupal 8.4 and Drush need PHP 7.1 but server defaults to 7.0. Need script to check PHP version and use the right one.
+    - ssh [email protected] '/bin/bash -u -e -s' < ./scripts/remote-drush-commands_base-live.sh
+
+# Deploy plus demo to LIVE site (CLOUD4).
+plus-demo-to-live:
+  stage: deploy-live
+  when: manual
+
+  # add any other tags or branches you want here.
+  # NOTE: Master is also pushed to public accessible GitHub repo: https://github.com/AcroMedia/commerce-demo
+  only:
+    - master
 
+  environment:
+    name: cloud4
+    url: https://demoplus.cloud4.acromedia.com
+
+  script:
+    # Install ssh-agent if not already installed, it is required by Docker
+    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+
+    # Run ssh-agent (inside the build environment)
+    - eval $(ssh-agent -s)
+
+    # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
+    - ssh-add <(echo "$DEPLOY_KEY_CLIENT_DEMO")
+
+    # For Docker builds disable host key checking. Be aware that by adding that
+    # you are susceptible to man-in-the-middle attacks.
+    # WARNING: Use this only with the Docker executor, if you use it with shell
+    # you will overwrite your user's SSH config.
+    - mkdir -p ~/.ssh
+    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+
+    # Install composer and move updated files up to deployment server, exclude .git since it's not needed
+    - rsync -av --no-perms --no-owner --no-group --exclude-from '.gitlabci-rsync-exclude.txt' --exclude '.git' --delete ./ [email protected]:/home/drupalcommerce/www/demoplus/
+
+    # log into the site and flush cache
+    # IMPORTANT: Drupal 8.4 and Drush need PHP 7.1 but server defaults to 7.0. Need script to check PHP version and use the right one.
+    - ssh [email protected] '/bin/bash -u -e -s' < ./scripts/remote-drush-commands_plus-live.sh

.gitlabci-rsync-exclude.txt

@@ -0,0 +1,6 @@
+dumps
+data
+db_backups
+database.sql
+web/sites/default/files
+web/sites/default/settings.local.php

.platform.app.yaml

@@ -0,0 +1,112 @@
+# This file describes an application. You can have multiple applications
+# in the same project.
+#
+# See https://docs.platform.sh/user_guide/reference/platform-app-yaml.html
+
+# The name of this app. Must be unique within a project.
+name: 'app'
+
+# The runtime the application uses.
+type: 'php:7.1'
+
+# Configuration of the build of this application.
+build:
+    flavor: composer
+
+# The relationships of the application with services or other applications.
+#
+# The left-hand side is the name of the relationship as it will be exposed
+# to the application in the PLATFORM_RELATIONSHIPS variable. The right-hand
+# side is in the form `<service name>:<endpoint name>`.
+relationships:
+    database: 'mysqldb:mysql'
+    solr: 'solrsearch:main'
+#    redis: 'rediscache:redis'
+
+dependencies:
+  nodejs:
+    npm: '~5.4.2'
+
+# The configuration of app when it is exposed to the web.
+web:
+    # Specific parameters for different URL prefixes.
+    locations:
+        '/':
+            # The folder from which to serve static assets, for this location.
+            #
+            # This is a filesystem path, relative to the application root.
+            root: 'web'
+
+            # How long to allow static assets from this location to be cached.
+            #
+            # Can be a time in seconds, or -1 for no caching. Times can be
+            # suffixed with "s" (seconds), "m" (minutes), "h" (hours), "d"
+            # (days), "w" (weeks), "M" (months, as 30 days) or "y" (years, as
+            # 365 days).
+            expires: 5m
+
+            # Whether to forward disallowed and missing resources from this
+            # location to the application.
+            #
+            # Can be true, false or a URI path string.
+            passthru: '/index.php'
+
+            # Deny access to static files in this location.
+            allow: false
+
+            # Rules for specific URI patterns.
+            rules:
+                # Allow access to common static files.
+                '\.(jpe?g|png|gif|svgz?|css|js|map|ico|bmp|eot|woff2?|otf|ttf)$':
+                    allow: true
+                '^/robots\.txt$':
+                    allow: true
+                '^/sitemap\.xml$':
+                    allow: true
+
+        '/sites/default/files':
+            # Allow access to all files in the public files directory.
+            allow: true
+            expires: 5m
+            passthru: '/index.php'
+            root: 'web/sites/default/files'
+
+            # Do not execute PHP scripts.
+            scripts: false
+
+            rules:
+                # Provide a longer TTL (2 weeks) for aggregated CSS and JS files.
+                '^/sites/default/files/(css|js)':
+                    expires: 2w
+
+# The size of the persistent disk of the application (in MB).
+disk: 2048
+
+# The 'mounts' describe writable, persistent filesystem mounts in the application. The keys are
+# directory paths, relative to the application root. The values are strings such as
+# 'shared:files/NAME', where NAME is just a unique name for the mount.
+mounts:
+    '/web/sites/default/files': 'shared:files/files'
+    '/tmp': 'shared:files/tmp'
+    '/private': 'shared:files/private'
+    '/drush-backups': 'shared:files/drush-backups'
+
+# The hooks executed at various points in the lifecycle of the application.
+hooks:
+    build: |
+      cd web/themes/custom/commerce_2_demo
+      npm install
+      npm run build-sass
+    # The deploy hook runs after your application has been deployed and started.
+    deploy: |
+      cd web
+      drush -y cache-rebuild
+      drush -y updatedb
+      drush -y config-import
+      drush -y entup
+
+# The configuration of scheduled execution.
+crons:
+    drupal:
+        spec: '*/20 * * * *'
+        cmd: 'cd web ; drush core-cron'

.platform/routes.yaml

@@ -0,0 +1,12 @@
+# The routes of the project.
+#
+# Each route describes how an incoming URL is going
+# to be processed by Platform.sh.
+
+"https://{default}/":
+    type: upstream
+    upstream: "app:http"
+
+"https://www.{default}/":
+    type: redirect
+    to: "https://{default}/"

.platform/services.yaml

@@ -0,0 +1,22 @@
+# The services of the project.
+#
+# Each service listed will be deployed
+# to power your Platform.sh project.
+
+mysqldb:
+    type: "mysql:10.2"
+    disk: 2048
+#
+#rediscache:
+#    type: "redis:3.2"
+#
+solrsearch:
+    type: "solr:6.6"
+    disk: 1024
+    configuration:
+        cores:
+            drupalcommerce_demo:
+                conf_dir: !archive "solr-conf/6.x"
+        endpoints:
+            main:
+                core: drupalcommerce_demo

.platform/solr-conf/6.x/elevate.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ This file allows you to boost certain search items to the top of search
+ results. You can find out an item's ID by searching directly on the Solr
+ server. The item IDs are in general constructed as follows:
+   Search API:
+     $document->id = $index_id . '-' . $item_id;
+   Apache Solr Search Integration:
+     $document->id = $site_hash . '/' . $entity_type . '/' . $entity->id;
+
+ If you want this file to be automatically re-loaded when a Solr commit takes
+ place (e.g., if you have an automatic script active which updates elevate.xml
+ according to newly-indexed data), place it into Solr's data/ directory.
+ Otherwise, place it with the other configuration files into the conf/
+ directory.
+
+ See http://wiki.apache.org/solr/QueryElevationComponent for more information.
+-->
+
+<elevate>
+<!-- Example for ranking the node #1 first in searches for "example query": -->
+<!--
+ <query text="example query">
+  <doc id="default_node_index-1" />
+  <doc id="7v3jsc/node/1" />
+ </query>
+-->
+<!-- Multiple <query> elements can be specified, contained in one <elevate>. -->
+<!-- <query text="...">...</query> -->
+</elevate>

.platform/solr-conf/6.x/mapping-ISOLatin1Accent.txt

@@ -0,0 +1,14 @@
+# This file contains character mappings for the default fulltext field type.
+# The source characters (on the left) will be replaced by the respective target
+# characters before any other processing takes place.
+# Lines starting with a pound character # are ignored.
+#
+# For sensible defaults, use the mapping-ISOLatin1Accent.txt file distributed
+# with the example application of your Solr version.
+#
+# Examples:
+#   "À" => "A"
+#   "\u00c4" => "A"
+#   "\u00c4" => "\u0041"
+#   "æ" => "ae"
+#   "\n" => " "