Merge pull request #62 from TheDMSGroup/dev

2.15.0-beta

Author: heathdutton

.ebextensions/50_php.config

@@ -12,6 +12,7 @@ option_settings:
 packages:
   yum:
     php71-imap: []
+    php71-pecl-redis: []
 
 files:
   "/etc/php.d/z_project.ini":
@@ -74,3 +75,6 @@ container_commands:
   # A restart of apache is not typically necessary.
   # 52_restart_httpd:
   #   command: sudo service httpd restart
+  53_redis_configure:
+    command: bash scripts/redis-start.sh
+    ignoreErrors: true

.ebextensions/60_io.config

@@ -73,8 +73,6 @@ container_commands:
       ln -sf /efs/mautic/app/config/local.php mautic/app/config/local.php
       rm -rf /tmp/imports
       ln -sf /efs/mautic/imports /tmp
-      rm -rf mautic/app/cache/prod/data/shared_dashboard
-      ln -sf /efs/mautic/app/cache/data/shared_dashboard mautic/app/cache/prod/data
   # Override all EFS permissions as a precaution. At large scale this step may need to be removed.
   66_io_efs_permissions:
     leader_only: true

.ebextensions/70_mautic.config

@@ -1,9 +1,16 @@
 # General commands for Mautic setup.
 container_commands:
-  # Intentionally avoid warmup as it causes a number of issues.
+  # Intentionally clear cache to ensure there are no obvious code issues, then recreate required cache folders.
   70_mautic_cache_clear:
-    command: rm -rf ./mautic/app/cache/ ; console cache:clear --no-interaction --no-warmup -vvv
-    ignoreErrors: true
+    command: |
+      rm -rf mautic/app/cache/
+      console cache:clear --no-interaction --no-warmup -vvv
+      mkdir -p mautic/app/cache/prod/data
+      chown -R webapp:webapp mautic/app/cache
+      chmod -R ug+wx mautic/app/cache
+  # Link the shared dashboard EFS mount after a cache clear.
+  71_mautic_efs_shared_dashboard:
+    command: ln -sf /efs/mautic/app/cache/data/shared_dashboard mautic/app/cache/prod/data
   # Installation will only take place if the environment variable MAUTIC_INSTALL is 1.
   71_mautic_install:
     command: bash scripts/mautic-install.sh

.ebextensions/80_cron_start.config

@@ -25,7 +25,7 @@ files:
       # SEGMENTS
       # To keep the segments current.
       # Run up to 3 batches of 300 contacts per segment, then move on to the next.
-      */10 * * * * root cronloop mautic:segments:update --max-contacts=5000 --batch-limit=1000 --quiet >/dev/null 2>&1
+      */10 * * * * root cronloop mautic:segments:update --max-contacts=10000 --batch-limit=10000 --quiet >/dev/null 2>&1
 
       # CAMPAIGNS
       # To keep campaigns updated with applicable contacts.
@@ -56,8 +56,7 @@ files:
 
       # IMPORTS
       # To run imports in offline processing.
-      # Import only 900 at a time for memory limit reduction and loop when done for speed.
-      */10 * * * * root cronloop mautic:import --limit=300 --quiet >/dev/null 2>&1
+      * * * * * root if [ ! -d /tmp/imports ]; then sudo ln -sf /efs/mautic/imports /tmp ; fi ; console mautic:import --quiet >/dev/null 2>&1
 
       # IP Lookup
       # Update maxmind databse at 9am on first Tuesday of each month on all instances.

.ebextensions/90_cron_custom.config

@@ -38,4 +38,8 @@ files:
 
       # DASHBOARD WARM
       # Caches dashboard widgets so that the login is faster for the most active users.
-      */30 * * * * root cron mautic:dashboard:warm >/dev/null 2>&1
+      */5 * * * * root cron mautic:dashboard:warm >/dev/null 2>&1
+
+      # SEGEMNT UPDATER
+      # Updates high volume segments at regular intervals
+      */10 * * * * root /bin/bash /var/app/current/scripts/mautic-segment-worker.sh >/dev/null 2>&1

README.md

@@ -33,6 +33,7 @@ while maintaining HIPAA & PCI compliance. Other helpful services such as CloudFl
 
 #### Optional:
 
+    REDIS_HOST               - Set to the path of your Redis server/cluster to use Redis for session storage. Helps avoid CSRF errors when scaling. See https://github.com/phpredis/phpredis
     MAUTIC_INSTALL           - Set to "1" to initialize mautic for the first/cold deployment only!
     MAUTIC_WORKERS           - Number of concurrent campaign trigger workers to run on the leading instance.
                              - Instead of MAUTIC_WORKERS, we reccomend using the following 3 variables now to better control your timing.

composer.json

@@ -4,7 +4,8 @@
   "description": "Mautic Open Source Distribution - Modified for scalability",
   "license": "GPL-3.0-only",
   "require": {
-    "mautic/core": "dev-master#d27414a2044fed72ecbb39d88ed6a8d80b4fe9eb"
+    "mautic/core": "dev-master#f6aa213482047108968ed9766a2eda7c8e94d615",
+    "aws/aws-sdk-php": "3.36"
   },
   "repositories": [
     {