Merge branch 'development'

Author: johangant

.circleci/config.yml

@@ -76,6 +76,22 @@ commands:
       - run:
           name: Keyscan GitHub hostname
           command: mkdir -p ~/.ssh && ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+  update_robots_dot_txt:
+    description: "Apply custom config to robots.txt file"
+    steps:
+      - run:
+          name: Update robots file
+          command: |
+            cd /home/circleci/project/web
+            cp -f robots_nidirect.txt robots.txt
+  rename_healthcheck_file:
+    description: "Renames the healthcheck.php file with a uuid to prevent filename guessing"
+    steps:
+      - run:
+          name: Rename healthcheck file
+          command: |
+            cd /home/circleci/project/web
+            mv -f healthcheck.php hc_$HEALTHCHECK_ID.php
 
 jobs:
   # Tests the integrity of the build, stores the results in a workspace for re-use in later jobs.
@@ -86,6 +102,8 @@ jobs:
       - checkout_code
       - install_php_os_extensions
       - composer_tasks
+      - update_robots_dot_txt
+      - rename_healthcheck_file
       - persist_to_workspace:
           root: ./
           paths:
@@ -107,6 +125,7 @@ jobs:
             composer require dof-dss/nidirect-site-modules:dev-development dof-dss/nidirect-migrations:dev-development \
               dof-dss/nidirect-d8-test-install-profile:dev-development dof-dss/nicsdru_origins_theme:dev-development \
               dof-dss/nicsdru_origins_modules:dev-development dof-dss/nicsdru_nidirect_theme:dev-development
+      - update_robots_dot_txt
       - persist_to_workspace:
           root: ./
           paths:
@@ -339,6 +358,12 @@ jobs:
           name: Set GAC state variable
           command: |
             /home/circleci/.platformsh/bin/platform environment:drush "sset google_analytics_counter.access_token ${GAC_ACCESS_TOKEN}" -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH
+      - run:
+          name: Enable test user accounts
+          command: |
+            for username in nw_test_admin nw_test_apps nw_test_authenticated nw_test_author nw_test_editor nw_test_gp_author nw_test_gp_super nw_test_news_super nw_test_super; do
+              /home/circleci/.platformsh/bin/platform environment:drush user:unblock $username
+            done
       - run:
           name: Force purge of Solr index
           command: /home/circleci/.platformsh/bin/platform ssh -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH "curl http://${PLATFORM_SOLR_HOST}/solr/default/update --data '<delete><query>*:*</query></delete>' -H 'Content-type:text/xml; charset=utf-8' && curl http://${PLATFORM_SOLR_HOST}/solr/default/update --data '<commit/>' -H 'Content-type:text/xml; charset=utf-8'"

composer.json

@@ -47,7 +47,7 @@
         "dof-dss/nicsdru_origins_theme": "^0.3.15",
         "dof-dss/nidirect-d8-test-install-profile": "^1.0",
         "dof-dss/nidirect-migrations": "^1.0",
-        "dof-dss/nidirect-site-modules": "^1.0",
+        "dof-dss/nidirect-site-modules": "^1.0.2",
         "drupal/address": "^1.7",
         "drupal/admin_toolbar": "^2.0",
         "drupal/adminimal_theme": "^1.5",

composer.lock

@@ -1,6 +1,6 @@
 hotlink: false
-origin: ''
-origin_dir: false
+origin: 'https://www.nidirect.gov.uk'
+origin_dir: sites/default/files
 use_imagecache_root: true
 verify: true
 _core:

config/local/stage_file_proxy.settings.yml

@@ -31,6 +31,7 @@ module:
   ctools_entity_mask: 0
   datetime: 0
   datetime_range: 0
+  dblog: 0
   diff: 0
   dynamic_entity_reference: 0
   dynamic_page_cache: 0
@@ -84,9 +85,7 @@ module:
   metatag_twitter_cards: 0
   metatag_verification: 0
   migrate: 0
-  migrate_absolute_links: 0
   migrate_plus: 0
-  migrate_process_trim: 0
   migrate_tools: 0
   moderation_sidebar: 0
   multiline_config: 0
@@ -109,7 +108,6 @@ module:
   nidirect_school_closures: 0
   nidirect_search: 0
   nidirect_taxonomy_navigator: 0
-  nidirect_temporary: 0
   nidirect_tour: 0
   nidirect_webforms: 0
   node: 0

config/sync/block.block.inthissection.yml

@@ -0,0 +1,3 @@
+row_limit: 10000
+_core:
+  default_config_hash: e883aGsrt1wFrsydlYU584PZONCSfRy0DtkZ9KzHb58

config/sync/core.extension.yml

@@ -1,7 +1,9 @@
-uuid: 6ac66ae9-b073-4365-ba89-82680f5e5351
+uuid: 928e45ac-3ce4-44d4-a116-f23e46bcf57d
 langcode: en
 status: true
 dependencies: {  }
+_core:
+  default_config_hash: qQi97vXvGPzf7nKi-Y3ZG4JmVbb8vsGtxAn6R6uMTf8
 id: money_advice_service_rss_articles
 class: null
 field_plugin_method: null

config/sync/dblog.settings.yml

@@ -25,20 +25,3 @@ blocks:
         value: '<p><a class="btn btn--primary btn--medium btn--block" href="http://www.metoffice.gov.uk/">Met Office weather</a></p>'
         summary: ''
         format: full_html
-  -
-    info: 'In this section'
-    langcode: en
-    uuid: 5622a22b-7e20-4c34-a332-1b600def9c4c
-    bundle: basic
-    revision_id: null
-    rev_id_current: null
-    fields:
-      body:
-        value: |
-          <ul>
-          	<li><a href="/contacts">Contacts A to Z</a></li>
-          	<li><a href="/contacts/government-departments-in-northern-ireland">Government departments in Northern Ireland</a></li>
-          	<li><a href="/contacts/local-councils-in-northern-ireland">Local councils in Northern Ireland</a></li>
-          </ul>
-        summary: ''
-        format: full_html

config/sync/migrate_plus.migration.money_advice_service_rss_articles.yml

@@ -0,0 +1,17 @@
+uuid: 9ae7ef5e-186e-4ca7-a6a7-5b4e5639bb2c
+langcode: en
+status: true
+dependencies:
+  module:
+    - dblog
+title: 'Remove expired log messages and flood control events'
+id: dblog_cron
+weight: 0
+module: dblog
+callback: dblog_cron
+scheduler:
+  id: simple
+launcher:
+  id: serial
+logger:
+  id: database

config/sync/structure_sync.data.yml

@@ -1,4 +1,4 @@
-uuid: 46f892fc-88d6-4381-8896-6beab8697a6d
+uuid: 8997bc7f-222c-4824-87fa-dd04865f4a19
 langcode: en
 status: true
 dependencies: