Skip to content

Commit

Permalink
Merge pull request #1287 from dof-dss/D8UN-uat
Browse files Browse the repository at this point in the history 
Release to main 0.28.1
  • Loading branch information
@ooneill547
ooneill547 authored Apr 28, 2022
2 parents 1e4160d + e176dc7 commit d580aca
Show file tree
Hide file tree
Showing 1,174 changed files with 35,417 additions and 30,185 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ commands:
- run:
name: Switch dof-dss packages to HEAD on develelopment branch
command: |
composer require dof-dss/nicsdru_unity_theme:dev-development dof-dss/nicsdru_origins_modules:dev-development
composer require dof-dss/nicsdru_unity_theme:dev-development dof-dss/nicsdru_origins_modules:dev-development dof-dss/nicsdru_unity_modules:dev-development
install_psh_cli:
description: "Install the Platform.sh CLI tool"
steps:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
/web/themes/contrib/
/web/themes/custom/
/web/profiles/contrib/
/web/profiles/unity
/web/libraries/
/web/modules/migrate/
/web/modules/origins
/web/modules/custom
console/
imports
node_modules/
Expand Down
2 changes: 1 addition & 1 deletion .platform.app.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ hooks:
export FASTLY_API_SERVICE=$temp
# For each multi site - clear cache (including Fastly cache)
for site in uregni odscni fiscalcommissionni urologyservicesinquiry mahinquiry niauditoffice nifiscalcouncil octf employmenttribunalsni independentreviewofeducation nipolicingboard investnireview pbni
for site in uregni odscni fiscalcommissionni urologyservicesinquiry mahinquiry niauditoffice nifiscalcouncil octf employmenttribunalsni independentreviewofeducation nipolicingboard investnireview pbni cscsreviewni pcsps attorneygeneralni
do
echo "****** $site cache clear ******"
cd /app/web/sites/$site
Expand Down
232 changes: 17 additions & 215 deletions .platform/routes.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,15 @@
# Each route describes how an incoming URL is going to be processed by Platform.sh.
"https://www.uregni.gov.uk/":
type: upstream
upstream: "unity:http"
cache:
enabled: false

"https://uregni.gov.uk.{default}/":
type: redirect
to: "https://www.uregni.gov.uk.{default}/"

"https://uregni.gov.uk/":
type: redirect
to: "https://www.uregni.gov.uk/"

#---------------------------------

"https://www.liofa.eu/":
type: upstream
upstream: "unity:http"
cache:
enabled: false

"https://liofa.eu.{default}/":
type: redirect
to: "https://www.liofa.eu.{default}/"

"https://liofa.eu/":
type: redirect
to: "https://www.liofa.eu/"

#---------------------------------

"https://www.odscni.org.uk/":
type: upstream
upstream: "unity:http"
cache:
enabled: false

"https://odscni.org.uk.{default}/":
type: redirect
to: "https://www.odscni.org.uk.{default}/"

"https://odscni.org.uk/":
type: redirect
to: "https://www.odscni.org.uk/"

# The 'Catch all' routes at the bottom of this file will generate routes for all sites whose domain
# name has been added to the 'domains' section on the Platform.sh dashboard i.e. all sites that are 'live'.
# Note that, for these live sites, all URLs will also be correctly generated for their other Platform sites
# such as UAT and Edge.
#
# The only sites that need to be explicitly listed here are those that are not yet fully 'live' i.e. their
# domain name has not yet been added to the 'domains' section of the Platform.sh dashboard. For these sites
# an 'upstream' entry should be added for the 'www' version of the site and a 'redirect' entry should also
# be added.
#
# When a site becomes fully 'live' and its domain is added to the Platform.sh dashboard then any explicit
# routes that appear below for that site should be removed.
#---------------------------------

"https://www.attorneygeneralni.gov.uk/":
Expand All @@ -53,154 +18,18 @@
cache:
enabled: false

"https://attorneygeneralni.gov.uk.{default}/":
type: redirect
to: "https://www.attorneygeneralni.gov.uk.{default}/"

"https://attorneygeneralni.gov.uk/":
type: redirect
to: "https://www.attorneygeneralni.gov.uk/"

#---------------------------------

"https://www.employmenttribunalsni.co.uk/":
type: upstream
upstream: "unity:http"
cache:
enabled: false

"https://employmenttribunalsni.co.uk.{default}/":
type: redirect
to: "https://www.employmenttribunalsni.co.uk.{default}/"

"https://employmenttribunalsni.co.uk/":
type: redirect
to: "https://www.employmenttribunalsni.co.uk/"

#---------------------------------

"https://www.niauditoffice.gov.uk/":
type: upstream
upstream: "unity:http"
cache:
enabled: false

"https://niauditoffice.gov.uk.{default}/":
type: redirect
to: "https://www.niauditoffice.gov.uk.{default}/"

"https://niauditoffice.gov.uk/":
type: redirect
to: "https://www.niauditoffice.gov.uk/"

#---------------------------------

"https://www.fiscalcommissionni.org/":
type: upstream
upstream: "unity:http"
cache:
enabled: false

"https://fiscalcommissionni.org.{default}/":
type: redirect
to: "https://www.fiscalcommissionni.org.{default}/"

"https://fiscalcommissionni.org/":
type: redirect
to: "https://www.fiscalcommissionni.org/"

#---------------------------------

"https://www.nifiscalcouncil.org/":
type: upstream
upstream: "unity:http"
cache:
enabled: false

"https://nifiscalcouncil.org.{default}/":
type: redirect
to: "https://www.nifiscalcouncil.org.{default}/"

"https://nifiscalcouncil.org/":
type: redirect
to: "https://www.nifiscalcouncil.org/"

#---------------------------------

"https://www.octf.gov.uk/":
type: upstream
upstream: "unity:http"
cache:
enabled: false

"https://octf.gov.uk.{default}/":
type: redirect
to: "https://www.octf.gov.uk.{default}/"

"https://octf.gov.uk/":
type: redirect
to: "https://www.octf.gov.uk/"

#---------------------------------

"https://www.urologyservicesinquiry.org.uk/":
type: upstream
upstream: "unity:http"
cache:
enabled: false

"https://urologyservicesinquiry.org.uk.{default}/":
type: redirect
to: "https://www.urologyservicesinquiry.org.uk.{default}/"

"https://urologyservicesinquiry.org.uk/":
type: redirect
to: "https://www.urologyservicesinquiry.org.uk/"

#---------------------------------

"https://www.mahinquiry.org.uk/":
type: upstream
upstream: "unity:http"
cache:
enabled: false

"https://mahinquiry.org.uk.{default}/":
type: redirect
to: "https://www.mahinquiry.org.uk.{default}/"

"https://mahinquiry.org.uk/":
type: redirect
to: "https://www.mahinquiry.org.uk/"

#---------------------------------

"https://www.independentreviewofeducation.org.uk/":
type: upstream
upstream: "unity:http"
cache:
enabled: false

"https://independentreviewofeducation.org.uk.{default}/":
type: redirect
to: "https://www.independentreviewofeducation.org.uk.{default}/"

"https://independentreviewofeducation.org.uk/":
type: redirect
to: "https://www.independentreviewofeducation.org.uk/"

#---------------------------------

"https://www.nipolicingboard.org.uk/":
type: upstream
upstream: "unity:http"
cache:
enabled: false

"https://nipolicingboard.org.uk.{default}/":
type: redirect
to: "https://www.nipolicingboard.org.uk.{default}/"

"https://nipolicingboard.org.uk/":
type: redirect
to: "https://www.nipolicingboard.org.uk/"
Expand All @@ -213,61 +42,34 @@
cache:
enabled: false

"https://pbni.org.uk.{default}/":
type: redirect
to: "https://www.pbni.org.uk.{default}/"

"https://pbni.org.uk/":
type: redirect
to: "https://www.pbni.org.uk/"

#---------------------------------

"https://www.investnireview.org.uk/":
type: upstream
upstream: "unity:http"
cache:
enabled: false

"https://investnireview.org.uk.{default}/":
type: redirect
to: "https://www.investnireview.org.uk.{default}/"

"https://investnireview.org.uk/":
type: redirect
to: "https://www.investnireview.org.uk/"

#---------------------------------

"https://www.pcsps.org/":
type: upstream
upstream: "unity:http"
cache:
enabled: false

"https://pcsps.org.{default}/":
type: redirect
to: "https://www.pcsps.org.{default}/"

"https://pcsps.org/":
type: redirect
to: "https://www.pcsps.org/"

#---------------------------------

"https://www.cscsreviewni.net/":
# Do not remove this route, the {default} domain must be
# explicitly defined as it is not included in {all}
"https://www.fiscalcommissionni.org.{default}/":
type: upstream
upstream: "unity:http"
cache:
enabled: false

"https://cscsreviewni.net.{default}/":
type: redirect
to: "https://www.cscsreviewni.net.{default}/"

"https://cscsreviewni.net/":
"https://fiscalcommissionni.org.{default}/":
type: redirect
to: "https://www.cscsreviewni.net/"
to: "https://www.fiscalcommissionni.org.{default}/"

#---------------------------------

Expand Down
7 changes: 5 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ We recommend Lando for local development. To get started, ensure you have the fo
- at the command line, 'cd' into your new directory
- Set up your local environment variables: `cp .lando/config/.env.sample .lando/config/.env`
- Env vars are divided into safe values for local development (eg: Lando defaults) and sensitive values which
you will need to source from a project member or from one of the active project environments.
- `composer install`
you will need to source from a project member or from one of the active project environments. In order to
just get you local Unity sites up and running the minimum that you will have to do is to set 'HASH_SALT' to
a random string e.g. 'ahsgsfdteyionuydythdop'
- `lando start`
- `lando composer install`


Or, if available, you may also fetch the database and import this:

Expand Down
18 changes: 14 additions & 4 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,16 @@
"dinbror/blazy": "^1.8",
"dof-dss/nicsdru_origins_modules": "^1.1",
"dof-dss/nicsdru_origins_profile": "0.1.11",
"dof-dss/nicsdru_unity_theme": "^0.1.49",
"dof-dss/nicsdru_unity_modules": "^1.0",
"dof-dss/nicsdru_unity_profile": "^1.0",
"dof-dss/nicsdru_unity_theme": "^0.1.50",
"drupal/address": "^1.7",
"drupal/admin_toolbar": "^2.0",
"drupal/adminimal_theme": "^1.5",
"drupal/allowed_formats": "^1.3",
"drupal/auto_entityqueue": "^2.0",
"drupal/block_blacklist": "^1.0",
"drupal/block_field": "^1.0@RC",
"drupal/block_list_override": "^1.0",
"drupal/block_visibility_groups": "^1.3",
"drupal/chosen": "^3.0",
Expand Down Expand Up @@ -106,6 +109,7 @@
"drupal/http_cache_control": "^2.0",
"drupal/inline_entity_form": "^1.0@RC",
"drupal/layout_builder_restrictions": "^2.12",
"drupal/link_fix_absolute_urls": "^1.0",
"drupal/linkit": "^6.0.0",
"drupal/media_entity_browser": "^2.0",
"drupal/media_library_edit": "^2.0",
Expand Down Expand Up @@ -209,12 +213,12 @@
"drupal/ultimate_cron": {
"Fix test function issue": "https://www.drupal.org/files/issues/2021-04-13/kernel_test-3208608-1.patch"
},
"drupal/eu_cookie_compliance": {
"Banner at top is not hiding correctly": "https://git.drupalcode.org/project/eu-cookie-compliance/-/merge_requests/43.diff"
},
"drupal/readonlymode": {
"Fatal typerror fix": "https://www.drupal.org/files/issues/2020-12-23/readonlymode-string_not_array-3115119-9.patch"
},
"drupal/eu_cookie_compliance": {
"Banner at top is not hiding correctly": "https://www.drupal.org/files/issues/2022-04-26/eu_cookie_compliance_banner_not_hiding_3277175-1.patch"
},
"drupal/fastly": {
"Allow disabling of logging": "https://git.drupalcode.org/project/fastly/-/merge_requests/6.patch"
}
Expand All @@ -235,12 +239,18 @@
"web/modules/origins": [
"dof-dss/nicsdru_origins_modules"
],
"web/modules/custom": [
"dof-dss/nicsdru_unity_modules"
],
"web/modules/contrib/{$name}": [
"type:drupal-module"
],
"web/modules/custom/{$name}": [
"type:drupal-custom-module"
],
"web/profiles/unity/nicsdru_unity_profile": [
"dof-dss/nicsdru_unity_profile"
],
"web/themes/custom/{$name}": [
"type:drupal-custom-theme"
],
Expand Down
Loading

0 comments on commit d580aca

Please sign in to comment.