Release to main

.lando.yml

@@ -9,22 +9,22 @@ name: unity_intranet
 proxy:
     appserver:
         - uregni.intranet.nigov.net.lndo.site
-        - niaomi.intranet.gov.uk.lndo.site
         - pps.intranet.nigov.net.lndo.site
+        - niaomi.intranet.nigov.net.lndo.site
 services:
     uregni_intranet_solr:
         type: 'solr:8.11'
         portforward: true
         core: default
         config:
             dir: .lando/config/solr/
-    niaomi_intranet_solr:
+    pps_intranet_solr:
         type: 'solr:8.11'
         portforward: true
         core: default
         config:
             dir: .lando/config/solr/
-    pps_intranet_solr:
+    niaomi_intranet_solr:
         type: 'solr:8.11'
         portforward: true
         core: default

.platform.app.yaml

@@ -45,7 +45,7 @@ build:
     flavor: composer
 hooks:
     build: "set -e\necho \"Update robots.txt with Unity customisations\"\ncp -f web/robots_unity.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 uregni niaomi pps\ndo\n  result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n  if [ \"$result\" = \"Successful\" ]; then\n    # Any properly configured Unity site will have the unity_common module installed.\n    result2=$(drush -l $site pml | grep \"unity_common\" | awk {'print $5'})\n    if [ \"$result2\" = \"Enabled\" ]; 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      # Clear up any erroneous redirects\n      drush -l $site delete-redirects\n      # Import blocks and taxonomies\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 not fully installed ******\"\n      echo \"\"\n    fi\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 uregni niaomi pps\ndo\n  result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n  if [ \"$result\" = \"Successful\" ]; then\n    # Any properly configured Unity site will have the unity_common module installed.\n    result2=$(drush -l $site pml | grep \"unity_common\" | awk {'print $5'})\n    if [ \"$result2\" = \"Enabled\" ]; 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\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 uregni pps niaomi\ndo\n  result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n  if [ \"$result\" = \"Successful\" ]; then\n    # Any properly configured Unity site will have the unity_common module installed.\n    result2=$(drush -l $site pml | grep \"unity_common\" | awk {'print $5'})\n    if [ \"$result2\" = \"Enabled\" ]; 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      # Clear up any erroneous redirects\n      drush -l $site delete-redirects\n      # Import blocks and taxonomies\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 not fully installed ******\"\n      echo \"\"\n    fi\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 uregni pps niaomi\ndo\n  result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n  if [ \"$result\" = \"Successful\" ]; then\n    # Any properly configured Unity site will have the unity_common module installed.\n    result2=$(drush -l $site pml | grep \"unity_common\" | awk {'print $5'})\n    if [ \"$result2\" = \"Enabled\" ]; 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\n  fi\ndone\n"
 web:
     locations:
         /:
@@ -82,10 +82,10 @@ relationships:
     redis: 'redis:redis'
     uregni: 'db:uregni'
     uregni_intranet_solr: 'solr_8_11:uregni'
-    niaomi: 'db:niaomi'
-    niaomi_intranet_solr: 'solr_8_11:niaomi'
     pps: 'db:pps'
     pps_intranet_solr: 'solr_8_11:pps'
+    niaomi: 'db:niaomi'
+    niaomi_intranet_solr: 'solr_8_11:niaomi'
 crons:
     uregni:
         spec: '10 * * * *'
@@ -95,9 +95,9 @@ crons:
         commands:
             start: '/bin/bash /app/cronjob.sh'
         shutdown_timeout: 290
-    niaomi:
-        spec: '10 * * * *'
-        cmd: 'cd web/sites/niaomi ; drush core-cron'
     pps:
         spec: '10 * * * *'
         cmd: 'cd web/sites/pps ; drush core-cron'
+    niaomi:
+        spec: '10 * * * *'
+        cmd: 'cd web/sites/niaomi ; drush core-cron'

.platform/routes.yaml

@@ -10,12 +10,12 @@
     upstream: 'unity_intranet:http'
     cache:
         enabled: 'false'
-'https://niaomi.intranet.gov.uk/':
+'https://pps.intranet.nigov.net/':
     type: upstream
     upstream: 'unity_intranet:http'
     cache:
         enabled: 'false'
-'https://pps.intranet.nigov.net/':
+'https://niaomi.intranet.nigov.net/':
     type: upstream
     upstream: 'unity_intranet:http'
     cache:

.platform/services.yaml

@@ -11,38 +11,38 @@ db:
     configuration:
         schemas:
             - uregnidb
-            - niaomidb
             - ppsdb
+            - niaomidb
         endpoints:
             uregni:
                 default_schema: uregnidb
                 privileges:
                     uregnidb: admin
-            niaomi:
-                default_schema: niaomidb
-                privileges:
-                    niaomidb: admin
             pps:
                 default_schema: ppsdb
                 privileges:
                     ppsdb: admin
+            niaomi:
+                default_schema: niaomidb
+                privileges:
+                    niaomidb: admin
 solr_8_11:
     type: 'solr:8.11'
     disk: 1024
     configuration:
         cores:
             uregni_index:
                 conf_dir: !archive solr_config/
-            niaomi_index:
-                conf_dir: !archive solr_config/
             pps_index:
                 conf_dir: !archive solr_config/
+            niaomi_index:
+                conf_dir: !archive solr_config/
         endpoints:
             uregni:
                 core: uregni_index
-            niaomi:
-                core: niaomi_index
             pps:
                 core: pps_index
+            niaomi:
+                core: niaomi_index
 redis:
     type: 'redis:6.0'

README.md

@@ -3,6 +3,6 @@
  | Site  | ID | URL | Status | Default |
 | --- | --- | --- | --- | --- | 
 | Uregni | uregni | uregni.intranet.nigov.net | ![#fff3e0](https://placehold.co/140x30/ffe0b2/e65100.png?text=Development&font=source-sans-pro) |   | 
-| NIAO | niaomi | niaomi.intranet.gov.uk | ![#fff3e0](https://placehold.co/140x30/ffe0b2/e65100.png?text=Development&font=source-sans-pro) |   | 
 | PPS | pps | pps.intranet.nigov.net | ![#fff3e0](https://placehold.co/140x30/ffe0b2/e65100.png?text=Development&font=source-sans-pro) |   | 
-Last updated: 05/07/2024 14:37
+| NIAO | niaomi | niaomi.intranet.nigov.net | ![#fff3e0](https://placehold.co/140x30/ffe0b2/e65100.png?text=Development&font=source-sans-pro) |   | 
+Last updated: 31/07/2024 12:00

composer.json

@@ -48,10 +48,12 @@
         "cweagans/composer-patches": "^1.7",
         "dof-dss/nicsdru_origins_modules": "^10.3",
         "dof-dss/nicsdru_unity_modules": "^10.1",
+        "dof-dss/nicsdru_unity_profile": "^10.1",
         "dof-dss/nicsdru_unity_theme": "^10.1",
         "drupal/address": "^1.12",
         "drupal/admin_toolbar": "^3.4",
         "drupal/allowed_formats": "^2.0",
+        "drupal/antibot": "^2.0",
         "drupal/auto_entityqueue": "^2.1",
         "drupal/blazy": "2.16.0",
         "drupal/block_content_permissions": "^1.11",
@@ -60,7 +62,7 @@
         "drupal/block_visibility_groups": "^2.0",
         "drupal/ckeditor": "^1.0",
         "drupal/ckeditor5_allowed_html": "1.2.x-dev@dev",
-        "drupal/ckeditor5_premium_features": "^1.2",
+        "drupal/ckeditor5_premium_features": "^1.3",
         "drupal/clientside_validation": "^4.0",
         "drupal/clone_nodes": "^1.2@dev",
         "drupal/config_filter": "^1.10",
@@ -127,6 +129,7 @@
         "drupal/schema_metatag": "^3.0",
         "drupal/search_api": "^1.26",
         "drupal/search_api_autocomplete": "^1.4",
+        "drupal/search_api_glossary": "^4.2",
         "drupal/search_api_location": "^1.0@alpha",
         "drupal/search_api_solr": "4.3.0",
         "drupal/search_api_spellcheck": "^4.0",
@@ -205,12 +208,16 @@
                 "Handle missing core version": "https://www.drupal.org/files/issues/2019-12-19/easy_install_core_version-3101883-0.patch",
                 "non-existent service entity.manager": "https://www.drupal.org/files/issues/2020-12-08/3162621-4.patch"
             },
+            "drupal/entity_browser": {
+                "TypeError: key(): Argument #1 ($array) must be of type array": "https://www.drupal.org/files/issues/2024-06-12/2914385-35.patch"
+            },
             "drupal/entityqueue": {
                 "Allow unique records only": "https://www.drupal.org/files/issues/2021-02-07/entity_queue_unique_records-1240856-3197148.patch"
             },
             "drupal/facets": {
                 "Pass facet object onto child items": "https://www.drupal.org/files/issues/2019-11-13/child_item-3094143-2.patch",
-                "Fix to deprecated function $transliterateDisplayValue": "https://www.drupal.org/files/issues/2024-02-21/facets-php82-3406085-18.patch"
+                "Fix to deprecated function $transliterateDisplayValue": "https://www.drupal.org/files/issues/2024-02-21/facets-php82-3406085-18.patch",
+                "Fatal errors on config import": "https://www.drupal.org/files/issues/2023-10-20/3395567.patch"
             },
             "drupal/facets_pretty_paths": {
                 "facet pretty paths doubling up": "https://www.drupal.org/files/issues/2023-01-12/url_duplication-3254600-45.patch"