From 24fbedaa0d23514f9edd5960463c2fc12d1d13ec Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Fri, 16 Feb 2024 11:09:25 +0000 Subject: [PATCH 01/12] Rerun edge build --- .circleci/config.yml | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e0774d8d..bffdcff4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,39 +12,12 @@ default_docker_image: &docker_image workflows: version: 2 - build-test: - jobs: - - build - - coding_standards: - requires: - - build - - deprecated_code: - requires: - - build build-edge: - triggers: - - schedule: - # At 03:00 every Mon-Fri - cron: "0 3 * * 1-5" - filters: - branches: - only: - - development jobs: - build_edge - - # A separate scheduled workflow to sync the data after the edge build completes. - build-edge-finalise: - triggers: - - schedule: - # At 03:30 on every day-of-week from Monday through Friday - cron: "30 3 * * 1-5" - filters: - branches: - only: - - edge - jobs: - - sync_data + - sync_data: + requires: + - build_edge jobs: # Tests the integrity of the build, stores the results in a workspace for re-use in later jobs. From 193588879fd2d65496daecf1f321be4b138645a7 Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Fri, 16 Feb 2024 12:32:16 +0000 Subject: [PATCH 02/12] bump --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a77c17c..e4c0649f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![CircleCI](https://dl.circleci.com/status-badge/img/gh/dof-dss/corp-lite/tree/development.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/dof-dss/corp-lite/tree/development) -Multi-site Drupal project designed to run the following sites: +Multi-site Drupal project designed to run the following sites: - https://www.nisra.gov.uk/ - https://afbini.gov.uk/ From 051893b842ba31f51bc0d66299052a39834723be Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Fri, 16 Feb 2024 12:15:02 +0000 Subject: [PATCH 03/12] Upgrade Maestro hosting --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 4c004903..837707e1 100644 --- a/composer.lock +++ b/composer.lock @@ -14986,16 +14986,16 @@ }, { "name": "dof-dss/maestro-hosting", - "version": "1.0.12", + "version": "1.0.18", "source": { "type": "git", "url": "https://github.com/dof-dss/maestro-hosting.git", - "reference": "f93c2eb12cd5bf56d96cb3b0c9e990b11a11d09f" + "reference": "617dae9639f2345252ef902e7697733d9c94c228" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dof-dss/maestro-hosting/zipball/f93c2eb12cd5bf56d96cb3b0c9e990b11a11d09f", - "reference": "f93c2eb12cd5bf56d96cb3b0c9e990b11a11d09f", + "url": "https://api.github.com/repos/dof-dss/maestro-hosting/zipball/617dae9639f2345252ef902e7697733d9c94c228", + "reference": "617dae9639f2345252ef902e7697733d9c94c228", "shasum": "" }, "require": { @@ -15020,9 +15020,9 @@ "description": "Maestro hosting resources", "support": { "issues": "https://github.com/dof-dss/maestro-hosting/issues", - "source": "https://github.com/dof-dss/maestro-hosting/tree/1.0.12" + "source": "https://github.com/dof-dss/maestro-hosting/tree/1.0.18" }, - "time": "2023-12-06T11:41:56+00:00" + "time": "2024-02-16T12:11:59+00:00" }, { "name": "dof-dss/maestro-shell", From 21b95c7534ca5917cd2d9ebb79e7f0f0049e1783 Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Fri, 16 Feb 2024 12:16:54 +0000 Subject: [PATCH 04/12] Upgrade maestro shell --- composer.json | 2 +- composer.lock | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index 14ef6395..182a8635 100644 --- a/composer.json +++ b/composer.json @@ -139,7 +139,7 @@ }, "require-dev": { "dof-dss/maestro-hosting": "^1.0", - "dof-dss/maestro-shell": "^1.0", + "dof-dss/maestro-shell": "^10.1", "drupal/coder": "^8.3", "drupal/config_override_warn": "^1.4", "drupal/core-dev": "^10.1", diff --git a/composer.lock b/composer.lock index 837707e1..8956424f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0ef6375c45c27750da7a788dc96e237d", + "content-hash": "df19785956398cb60cce441a78ef02df", "packages": [ { "name": "asm89/stack-cors", @@ -15026,16 +15026,16 @@ }, { "name": "dof-dss/maestro-shell", - "version": "1.0.8", + "version": "10.1.1", "source": { "type": "git", "url": "https://github.com/dof-dss/maestro-shell.git", - "reference": "0cdfea7fe1f334159f8230b2c141f5930c8f804c" + "reference": "3e5aae4af31f3aaa72615a60bdf0f75e483e42ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dof-dss/maestro-shell/zipball/0cdfea7fe1f334159f8230b2c141f5930c8f804c", - "reference": "0cdfea7fe1f334159f8230b2c141f5930c8f804c", + "url": "https://api.github.com/repos/dof-dss/maestro-shell/zipball/3e5aae4af31f3aaa72615a60bdf0f75e483e42ba", + "reference": "3e5aae4af31f3aaa72615a60bdf0f75e483e42ba", "shasum": "" }, "require": { @@ -15045,15 +15045,15 @@ "romaricdrigon/metayaml": "dev-master", "stecman/symfony-console-completion": "^0.12", "symfony/cache": "^6.3", - "symfony/config": "^6.3", - "symfony/console": "^6.3", - "symfony/dependency-injection": "^6.3", - "symfony/event-dispatcher": "^6.3", - "symfony/filesystem": "^6.3", - "symfony/finder": "^6.3", + "symfony/config": "^6.0", + "symfony/console": "^6.0", + "symfony/dependency-injection": "^6.0", + "symfony/event-dispatcher": "^6.0", + "symfony/filesystem": "^6.0", + "symfony/finder": "^6.0", "symfony/http-client": "^5.4", - "symfony/process": "^6.3", - "symfony/yaml": "^6.3", + "symfony/process": "^6.0", + "symfony/yaml": "^6.0", "webflo/drupal-finder": "^1.2" }, "suggest": { @@ -15078,9 +15078,9 @@ "description": "Shell for working with Maestro projects.", "support": { "issues": "https://github.com/dof-dss/maestro-shell/issues", - "source": "https://github.com/dof-dss/maestro-shell/tree/1.0.8" + "source": "https://github.com/dof-dss/maestro-shell/tree/10.1.1" }, - "time": "2023-11-15T17:25:18+00:00" + "time": "2023-11-15T15:57:04+00:00" }, { "name": "drupal/coder", From 45af3b972e36161d2cfc24cab78743a7006056ac Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Fri, 16 Feb 2024 12:27:41 +0000 Subject: [PATCH 05/12] Upgrade maestro hosting --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 8956424f..92906734 100644 --- a/composer.lock +++ b/composer.lock @@ -14986,16 +14986,16 @@ }, { "name": "dof-dss/maestro-hosting", - "version": "1.0.18", + "version": "1.0.19", "source": { "type": "git", "url": "https://github.com/dof-dss/maestro-hosting.git", - "reference": "617dae9639f2345252ef902e7697733d9c94c228" + "reference": "797a3f17b9c921497014ee7d543f89eb4790e64e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dof-dss/maestro-hosting/zipball/617dae9639f2345252ef902e7697733d9c94c228", - "reference": "617dae9639f2345252ef902e7697733d9c94c228", + "url": "https://api.github.com/repos/dof-dss/maestro-hosting/zipball/797a3f17b9c921497014ee7d543f89eb4790e64e", + "reference": "797a3f17b9c921497014ee7d543f89eb4790e64e", "shasum": "" }, "require": { @@ -15020,9 +15020,9 @@ "description": "Maestro hosting resources", "support": { "issues": "https://github.com/dof-dss/maestro-hosting/issues", - "source": "https://github.com/dof-dss/maestro-hosting/tree/1.0.18" + "source": "https://github.com/dof-dss/maestro-hosting/tree/1.0.19" }, - "time": "2024-02-16T12:11:59+00:00" + "time": "2024-02-16T12:24:46+00:00" }, { "name": "dof-dss/maestro-shell", From 851945ec888fbc2d2ae836af4f9c162b0ce9b3d6 Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Fri, 16 Feb 2024 12:28:17 +0000 Subject: [PATCH 06/12] Changes after maestro upgrade --- .lando.base.yml | 1 - .platform.app.yaml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.lando.base.yml b/.lando.base.yml index 596ad97d..5c8835ef 100644 --- a/.lando.base.yml +++ b/.lando.base.yml @@ -14,7 +14,6 @@ env_file: - .env services: appserver: - scanner: false xdebug: debug build_as_root: - /app/.lando/scripts/appserver_build.sh diff --git a/.platform.app.yaml b/.platform.app.yaml index 9554ec39..e13e24ef 100644 --- a/.platform.app.yaml +++ b/.platform.app.yaml @@ -41,7 +41,7 @@ build: flavor: composer hooks: build: "set -e\necho \"Update robots.txt with Corp Lite customisations\"\ncp -f web/robots_custom.txt web/robots.txt\n" - post_deploy: "set -e\n\n# Save the Fastly service value and overwrite with a dummy one in order to break\n# the connection to Fastly, otherwise any cache clear of any site will purge the\n# entire Fastly cache - we don't want this to happen as we'd like Fastly to continue\n# serving the sites to anonymous users during a release.\necho \"***** Breaking connection to Fastly ******\"\ntemp=$FASTLY_API_SERVICE\nexport FASTLY_API_SERVICE=dummyservice\n\n# For each multi site - run db-updates and import config.\nfor site in nisra afbini hseni etini northsouthministerialcouncil\ndo\n result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n if [ \"$result\" = \"Successful\" ]; then\n echo \"****** $site deployment ******\"\n cd /app/web/sites/$site\n # Disable Fastly logging\n #drush -l $site disable-fastly-logging\n # Readonlymode module should be installed on all sites,\n # but we'll just make sure.\n drush en readonlymode -l $site -y\n # Set site to readonly just in case editors are logged on.\n drush -l $site cset readonlymode.settings enabled 1 -y\n drush -l $site -y cache-rebuild\n drush -l $site -y updatedb\n drush -l $site -y config-import\n drush -l $site import-all-if-installed safe\n if [ \"$PLATFORM_ENVIRONMENT_TYPE\" = production ]; then\n # Disable QA logons\n drush -l $site bulk_update_qa_accounts disable\n else\n # Enable QA logons\n drush -l $site bulk_update_qa_accounts enable\n fi\n # Turn off readonly mode.\n #drush -l $site cset readonlymode.settings enabled 0 -y\n else\n echo \"****** Skipping $site as there is no database ******\"\n echo \"\"\n fi\ndone\n\n# Reconnect to Fastly\necho \"***** Reinstate connection to Fastly ******\"\nexport FASTLY_API_SERVICE=$temp\n\n# For each multi site - clear cache (including Fastly cache)\nfor site in nisra afbini hseni etini northsouthministerialcouncil\ndo\n result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n if [ \"$result\" = \"Successful\" ]; then\n echo \"****** $site cache clear ******\"\n cd /app/web/sites/$site\n drush -l $site -y cache-rebuild\n # Enable Fastly logging\n drush -l $site enable-fastly-logging\n fi\ndone\n" + post_deploy: "set -e\n\n# Save the Fastly service value and overwrite with a dummy one in order to break\n# the connection to Fastly, otherwise any cache clear of any site will purge the\n# entire Fastly cache - we don't want this to happen as we'd like Fastly to continue\n# serving the sites to anonymous users during a release.\necho \"***** Breaking connection to Fastly ******\"\ntemp=$FASTLY_API_SERVICE\nexport FASTLY_API_SERVICE=dummyservice\n\n# For each multi site - run db-updates and import config.\nfor site in nisra afbini hseni etini northsouthministerialcouncil\ndo\n result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n if [ \"$result\" = \"Successful\" ]; then\n echo \"****** $site deployment ******\"\n cd /app/web/sites/$site\n # Disable Fastly logging\n #drush -l $site disable-fastly-logging\n # Readonlymode module should be installed on all sites,\n # but we'll just make sure.\n drush en readonlymode -l $site -y\n # Set site to readonly just in case editors are logged on.\n drush -l $site cset readonlymode.settings enabled 1 -y\n drush -l $site -y cache-rebuild\n drush -l $site -y updatedb\n drush -l $site -y config-import\n # Import blocks and taxonomies\n drush -l $site import-blocks --choice=safe\n drush -l $site import-taxonomies --choice=safe\n if [ \"$PLATFORM_ENVIRONMENT_TYPE\" = production ]; then\n # Disable QA logons\n drush -l $site bulk_update_qa_accounts disable\n else\n # Enable QA logons\n drush -l $site bulk_update_qa_accounts enable\n fi\n # Turn off readonly mode.\n #drush -l $site cset readonlymode.settings enabled 0 -y\n else\n echo \"****** Skipping $site as there is no database ******\"\n echo \"\"\n fi\ndone\n\n# Reconnect to Fastly\necho \"***** Reinstate connection to Fastly ******\"\nexport FASTLY_API_SERVICE=$temp\n\n# For each multi site - clear cache (including Fastly cache)\nfor site in nisra afbini hseni etini northsouthministerialcouncil\ndo\n result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n if [ \"$result\" = \"Successful\" ]; then\n echo \"****** $site cache clear ******\"\n cd /app/web/sites/$site\n drush -l $site -y cache-rebuild\n # Enable Fastly logging\n drush -l $site enable-fastly-logging\n fi\ndone\n" web: locations: /: From f1114878ae2568190a7076196ef252ccd3db602f Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Fri, 16 Feb 2024 14:32:29 +0000 Subject: [PATCH 07/12] Upgrade structure_sync --- composer.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.lock b/composer.lock index 92906734..fb69a04b 100644 --- a/composer.lock +++ b/composer.lock @@ -7354,30 +7354,30 @@ }, { "name": "drupal/structure_sync", - "version": "2.0.5", + "version": "2.0.6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/structure_sync.git", - "reference": "2.0.5" + "reference": "2.0.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/structure_sync-2.0.5.zip", - "reference": "2.0.5", - "shasum": "eb744625ba3a8caf731dc7406b29797c8416f744" + "url": "https://ftp.drupal.org/files/projects/structure_sync-2.0.6.zip", + "reference": "2.0.6", + "shasum": "4891c7fb8360c6becb0c693dabcbcd653921941c" }, "require": { "drupal/core": "^8 || ^9 || ^10", "php": ">=7.1" }, "require-dev": { - "drush/drush": "^9 || ^10 || ^11" + "drush/drush": "^9 || ^10 || ^11 || ^12" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.5", - "datestamp": "1681378126", + "version": "2.0.6", + "datestamp": "1705960357", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7385,7 +7385,7 @@ }, "drush": { "services": { - "drush.services.yml": "^9 || ^10 || ^11" + "drush.services.yml": "^9 || ^10 || ^11 || ^12" } } }, From 96d42898e7c0bd34488347f893bdc63d00cadb01 Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Fri, 16 Feb 2024 14:59:29 +0000 Subject: [PATCH 08/12] Bump --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e4c0649f..2a77c17c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![CircleCI](https://dl.circleci.com/status-badge/img/gh/dof-dss/corp-lite/tree/development.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/dof-dss/corp-lite/tree/development) -Multi-site Drupal project designed to run the following sites: +Multi-site Drupal project designed to run the following sites: - https://www.nisra.gov.uk/ - https://afbini.gov.uk/ From b6493efb372a497bbd7d48c24553ebb241ab0216 Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Fri, 16 Feb 2024 15:06:41 +0000 Subject: [PATCH 09/12] Fix config so corplite_migrations not installed by default --- project/config/afbini/config/core.extension.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/project/config/afbini/config/core.extension.yml b/project/config/afbini/config/core.extension.yml index 657d9fb3..81cd2c05 100644 --- a/project/config/afbini/config/core.extension.yml +++ b/project/config/afbini/config/core.extension.yml @@ -29,7 +29,6 @@ module: cookie_content_blocker: 0 corplite_eu_cookie_compliance: 0 corplite_image_styles: 0 - corplite_migrations: 0 csp: 0 ctools: 0 date_facet_drilldown: 0 From 23fa6c645d8d8c58dca1cafb27185c301b265a8b Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Fri, 16 Feb 2024 15:24:31 +0000 Subject: [PATCH 10/12] BUmp --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a77c17c..e4c0649f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![CircleCI](https://dl.circleci.com/status-badge/img/gh/dof-dss/corp-lite/tree/development.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/dof-dss/corp-lite/tree/development) -Multi-site Drupal project designed to run the following sites: +Multi-site Drupal project designed to run the following sites: - https://www.nisra.gov.uk/ - https://afbini.gov.uk/ From 9d009b272561d54ccbf412d5aaf1a453d6a96b9b Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Fri, 16 Feb 2024 15:40:09 +0000 Subject: [PATCH 11/12] Bump --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e4c0649f..2a77c17c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![CircleCI](https://dl.circleci.com/status-badge/img/gh/dof-dss/corp-lite/tree/development.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/dof-dss/corp-lite/tree/development) -Multi-site Drupal project designed to run the following sites: +Multi-site Drupal project designed to run the following sites: - https://www.nisra.gov.uk/ - https://afbini.gov.uk/ From 75716dbcf0ee9aa06e734aff045bf8d1d6de1cec Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Fri, 16 Feb 2024 15:54:28 +0000 Subject: [PATCH 12/12] Upgrade maestro and rebuild project --- .platform.app.yaml | 2 +- composer.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.platform.app.yaml b/.platform.app.yaml index e13e24ef..19c00dd9 100644 --- a/.platform.app.yaml +++ b/.platform.app.yaml @@ -41,7 +41,7 @@ build: flavor: composer hooks: build: "set -e\necho \"Update robots.txt with Corp Lite customisations\"\ncp -f web/robots_custom.txt web/robots.txt\n" - post_deploy: "set -e\n\n# Save the Fastly service value and overwrite with a dummy one in order to break\n# the connection to Fastly, otherwise any cache clear of any site will purge the\n# entire Fastly cache - we don't want this to happen as we'd like Fastly to continue\n# serving the sites to anonymous users during a release.\necho \"***** Breaking connection to Fastly ******\"\ntemp=$FASTLY_API_SERVICE\nexport FASTLY_API_SERVICE=dummyservice\n\n# For each multi site - run db-updates and import config.\nfor site in nisra afbini hseni etini northsouthministerialcouncil\ndo\n result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n if [ \"$result\" = \"Successful\" ]; then\n echo \"****** $site deployment ******\"\n cd /app/web/sites/$site\n # Disable Fastly logging\n #drush -l $site disable-fastly-logging\n # Readonlymode module should be installed on all sites,\n # but we'll just make sure.\n drush en readonlymode -l $site -y\n # Set site to readonly just in case editors are logged on.\n drush -l $site cset readonlymode.settings enabled 1 -y\n drush -l $site -y cache-rebuild\n drush -l $site -y updatedb\n drush -l $site -y config-import\n # Import blocks and taxonomies\n drush -l $site import-blocks --choice=safe\n drush -l $site import-taxonomies --choice=safe\n if [ \"$PLATFORM_ENVIRONMENT_TYPE\" = production ]; then\n # Disable QA logons\n drush -l $site bulk_update_qa_accounts disable\n else\n # Enable QA logons\n drush -l $site bulk_update_qa_accounts enable\n fi\n # Turn off readonly mode.\n #drush -l $site cset readonlymode.settings enabled 0 -y\n else\n echo \"****** Skipping $site as there is no database ******\"\n echo \"\"\n fi\ndone\n\n# Reconnect to Fastly\necho \"***** Reinstate connection to Fastly ******\"\nexport FASTLY_API_SERVICE=$temp\n\n# For each multi site - clear cache (including Fastly cache)\nfor site in nisra afbini hseni etini northsouthministerialcouncil\ndo\n result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n if [ \"$result\" = \"Successful\" ]; then\n echo \"****** $site cache clear ******\"\n cd /app/web/sites/$site\n drush -l $site -y cache-rebuild\n # Enable Fastly logging\n drush -l $site enable-fastly-logging\n fi\ndone\n" + post_deploy: "set -e\n\n# Save the Fastly service value and overwrite with a dummy one in order to break\n# the connection to Fastly, otherwise any cache clear of any site will purge the\n# entire Fastly cache - we don't want this to happen as we'd like Fastly to continue\n# serving the sites to anonymous users during a release.\necho \"***** Breaking connection to Fastly ******\"\ntemp=$FASTLY_API_SERVICE\nexport FASTLY_API_SERVICE=dummyservice\n\n# For each multi site - run db-updates and import config.\nfor site in nisra afbini hseni etini northsouthministerialcouncil\ndo\n result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n if [ \"$result\" = \"Successful\" ]; then\n echo \"****** $site deployment ******\"\n cd /app/web/sites/$site\n # Readonlymode module should be installed on all sites,\n # but we'll just make sure.\n drush en readonlymode -l $site -y\n # Set site to readonly just in case editors are logged on.\n drush -l $site cset readonlymode.settings enabled 1 -y\n drush -l $site -y cache-rebuild\n drush -l $site -y updatedb\n drush -l $site -y config-import\n # Import blocks and taxonomies\n drush -l $site import-blocks --choice=safe\n drush -l $site import-taxonomies --choice=safe\n if [ \"$PLATFORM_ENVIRONMENT_TYPE\" = production ]; then\n # Disable QA logons\n drush -l $site bulk_update_qa_accounts disable\n else\n # Enable QA logons\n drush -l $site bulk_update_qa_accounts enable\n fi\n # Turn off readonly mode.\n #drush -l $site cset readonlymode.settings enabled 0 -y\n else\n echo \"****** Skipping $site as there is no database ******\"\n echo \"\"\n fi\ndone\n\n# Reconnect to Fastly\necho \"***** Reinstate connection to Fastly ******\"\nexport FASTLY_API_SERVICE=$temp\n\n# For each multi site - clear cache (including Fastly cache)\nfor site in nisra afbini hseni etini northsouthministerialcouncil\ndo\n result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n if [ \"$result\" = \"Successful\" ]; then\n echo \"****** $site cache clear ******\"\n cd /app/web/sites/$site\n drush -l $site -y cache-rebuild\n fi\ndone\n" web: locations: /: diff --git a/composer.lock b/composer.lock index fb69a04b..1f079b52 100644 --- a/composer.lock +++ b/composer.lock @@ -14986,16 +14986,16 @@ }, { "name": "dof-dss/maestro-hosting", - "version": "1.0.19", + "version": "1.0.20", "source": { "type": "git", "url": "https://github.com/dof-dss/maestro-hosting.git", - "reference": "797a3f17b9c921497014ee7d543f89eb4790e64e" + "reference": "f86748d84a182f5eda60151c2eaf9e8291372dfc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dof-dss/maestro-hosting/zipball/797a3f17b9c921497014ee7d543f89eb4790e64e", - "reference": "797a3f17b9c921497014ee7d543f89eb4790e64e", + "url": "https://api.github.com/repos/dof-dss/maestro-hosting/zipball/f86748d84a182f5eda60151c2eaf9e8291372dfc", + "reference": "f86748d84a182f5eda60151c2eaf9e8291372dfc", "shasum": "" }, "require": { @@ -15020,9 +15020,9 @@ "description": "Maestro hosting resources", "support": { "issues": "https://github.com/dof-dss/maestro-hosting/issues", - "source": "https://github.com/dof-dss/maestro-hosting/tree/1.0.19" + "source": "https://github.com/dof-dss/maestro-hosting/tree/1.0.20" }, - "time": "2024-02-16T12:24:46+00:00" + "time": "2024-02-16T15:49:41+00:00" }, { "name": "dof-dss/maestro-shell",