Skip to content

Commit

Permalink
Merge pull request #243 from SU-SWS/release-2.2.0
Browse files Browse the repository at this point in the history
Release 2.2.0
  • Loading branch information
joegl authored Sep 27, 2023
2 parents 1348fe2 + 8a7a851 commit ec02ac9
Show file tree
Hide file tree
Showing 114 changed files with 5,992 additions and 3,841 deletions.
269 changes: 269 additions & 0 deletions .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,269 @@
name: sdss
type: drupal9
docroot: docroot
php_version: "8.1"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"
xdebug_enabled: false
additional_hostnames: []
additional_fqdns: []
database:
type: mariadb
version: "10.4"
nfs_mount_enabled: false
mutagen_enabled: false
use_dns_when_possible: true
composer_version: "2"
web_environment: []
disable_settings_management: true
nodejs_version: "16"
hooks:
post-start:
- exec: drush uli

post-import-db:
- exec: drush cr
- exec: drush cim -y
- exec: drush uli

# Key features of ddev's config.yaml:

# name: <projectname> # Name of the project, automatically provides
# http://projectname.ddev.site and https://projectname.ddev.site

# type: <projecttype> # drupal6/7/8, backdrop, typo3, wordpress, php

# docroot: <relative_path> # Relative path to the directory containing index.php.

# php_version: "7.4" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"

# You can explicitly specify the webimage but this
# is not recommended, as the images are often closely tied to ddev's' behavior,
# so this can break upgrades.

# webimage: <docker_image> # nginx/php docker image.

# database:
# type: <dbtype> # mysql, mariadb
# version: <version> # database version, like "10.3" or "8.0"
# Note that mariadb_version or mysql_version from v1.18 and earlier
# will automatically be converted to this notation with just a "ddev config --auto"

# router_http_port: <port> # Port to be used for http (defaults to port 80)
# router_https_port: <port> # Port for https (defaults to 443)

# xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart"
# Note that for most people the commands
# "ddev xdebug" to enable xdebug and "ddev xdebug off" to disable it work better,
# as leaving xdebug enabled all the time is a big performance hit.

# xhprof_enabled: false # Set to true to enable xhprof and "ddev start" or "ddev restart"
# Note that for most people the commands
# "ddev xhprof" to enable xhprof and "ddev xhprof off" to disable it work better,
# as leaving xhprof enabled all the time is a big performance hit.

# webserver_type: nginx-fpm # or apache-fpm

# timezone: Europe/Berlin
# This is the timezone used in the containers and by PHP;
# it can be set to any valid timezone,
# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# For example Europe/Dublin or MST7MDT

# composer_root: <relative_path>
# Relative path to the composer root directory from the project root. This is
# the directory which contains the composer.json and where all Composer related
# commands are executed.

# composer_version: "2"
# You can set it to "" or "2" (default) for Composer v2 or "1" for Composer v1
# to use the latest major version available at the time your container is built.
# It is also possible to use each other Composer version channel. This includes:
# - 2.2 (latest Composer LTS version)
# - stable
# - preview
# - snapshot
# Alternatively, an explicit Composer version may be specified, for example "2.2.18".
# To reinstall Composer after the image was built, run "ddev debug refresh".

# nodejs_version: "16"
# change from the default system Node.js version to another supported version, like 12, 14, 17, 18.
# Note that you can use 'ddev nvm' or nvm inside the web container to provide nearly any
# Node.js version, including v6, etc.

# additional_hostnames:
# - somename
# - someothername
# would provide http and https URLs for "somename.ddev.site"
# and "someothername.ddev.site".

# additional_fqdns:
# - example.com
# - sub1.example.com
# would provide http and https URLs for "example.com" and "sub1.example.com"
# Please take care with this because it can cause great confusion.

# upload_dir: custom/upload/dir
# would set the destination path for ddev import-files to <docroot>/custom/upload/dir
# When mutagen is enabled this path is bind-mounted so that all the files
# in the upload_dir don't have to be synced into mutagen

# working_dir:
# web: /var/www/html
# db: /home
# would set the default working directory for the web and db services.
# These values specify the destination directory for ddev ssh and the
# directory in which commands passed into ddev exec are run.

# omit_containers: [db, dba, ddev-ssh-agent]
# Currently only these containers are supported. Some containers can also be
# omitted globally in the ~/.ddev/global_config.yaml. Note that if you omit
# the "db" container, several standard features of ddev that access the
# database container will be unusable. In the global configuration it is also
# possible to omit ddev-router, but not here.

# nfs_mount_enabled: false
# Great performance improvement but requires host configuration first.
# See https://ddev.readthedocs.io/en/latest/users/install/performance/#nfs

# mutagen_enabled: false
# Performance improvement using mutagen asynchronous updates.
# See https://ddev.readthedocs.io/en/latest/users/install/performance/#mutagen

# fail_on_hook_fail: False
# Decide whether 'ddev start' should be interrupted by a failing hook

# host_https_port: "59002"
# The host port binding for https can be explicitly specified. It is
# dynamic unless otherwise specified.
# This is not used by most people, most people use the *router* instead
# of the localhost port.

# host_webserver_port: "59001"
# The host port binding for the ddev-webserver can be explicitly specified. It is
# dynamic unless otherwise specified.
# This is not used by most people, most people use the *router* instead
# of the localhost port.

# host_db_port: "59002"
# The host port binding for the ddev-dbserver can be explicitly specified. It is dynamic
# unless explicitly specified.

# phpmyadmin_port: "8036"
# phpmyadmin_https_port: "8037"
# The PHPMyAdmin ports can be changed from the default 8036 and 8037

# host_phpmyadmin_port: "8036"
# The phpmyadmin (dba) port is not normally bound on the host at all, instead being routed
# through ddev-router, but it can be specified and bound.

# mailhog_port: "8025"
# mailhog_https_port: "8026"
# The MailHog ports can be changed from the default 8025 and 8026

# host_mailhog_port: "8025"
# The mailhog port is not normally bound on the host at all, instead being routed
# through ddev-router, but it can be bound directly to localhost if specified here.

# webimage_extra_packages: [php7.4-tidy, php-bcmath]
# Extra Debian packages that are needed in the webimage can be added here

# dbimage_extra_packages: [telnet,netcat]
# Extra Debian packages that are needed in the dbimage can be added here

# use_dns_when_possible: true
# If the host has internet access and the domain configured can
# successfully be looked up, DNS will be used for hostname resolution
# instead of editing /etc/hosts
# Defaults to true

# project_tld: ddev.site
# The top-level domain used for project URLs
# The default "ddev.site" allows DNS lookup via a wildcard
# If you prefer you can change this to "ddev.local" to preserve
# pre-v1.9 behavior.

# ngrok_args: --basic-auth username:pass1234
# Provide extra flags to the "ngrok http" command, see
# https://ngrok.com/docs#http or run "ngrok http -h"

# disable_settings_management: false
# If true, ddev will not create CMS-specific settings files like
# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalConfiguration.php
# In this case the user must provide all such settings.

# You can inject environment variables into the web container with:
# web_environment:
# - SOMEENV=somevalue
# - SOMEOTHERENV=someothervalue

# no_project_mount: false
# (Experimental) If true, ddev will not mount the project into the web container;
# the user is responsible for mounting it manually or via a script.
# This is to enable experimentation with alternate file mounting strategies.
# For advanced users only!

# bind_all_interfaces: false
# If true, host ports will be bound on all network interfaces,
# not just the localhost interface. This means that ports
# will be available on the local network if the host firewall
# allows it.

# default_container_timeout: 120
# The default time that ddev waits for all containers to become ready can be increased from
# the default 120. This helps in importing huge databases, for example.

#web_extra_exposed_ports:
#- name: nodejs
# container_port: 3000
# http_port: 2999
# https_port: 3000
#- name: something
# container_port: 4000
# https_port: 4000
# http_port: 3999
# Allows a set of extra ports to be exposed via ddev-router
# The port behavior on the ddev-webserver must be arranged separately, for example
# using web_extra_daemons.
# For example, with a web app on port 3000 inside the container, this config would
# expose that web app on https://<project>.ddev.site:9999 and http://<project>.ddev.site:9998
# web_extra_exposed_ports:
# - container_port: 3000
# http_port: 9998
# https_port: 9999

#web_extra_daemons:
#- name: "http-1"
# command: "/var/www/html/node_modules/.bin/http-server -p 3000"
# directory: /var/www/html
#- name: "http-2"
# command: "/var/www/html/node_modules/.bin/http-server /var/www/html/sub -p 3000"
# directory: /var/www/html

# override_config: false
# By default, config.*.yaml files are *merged* into the configuration
# But this means that some things can't be overridden
# For example, if you have 'nfs_mount_enabled: true'' you can't override it with a merge
# and you can't erase existing hooks or all environment variables.
# However, with "override_config: true" in a particular config.*.yaml file,
# 'nfs_mount_enabled: false' can override the existing values, and
# hooks:
# post-start: []
# or
# web_environment: []
# or
# additional_hostnames: []
# can have their intended affect. 'override_config' affects only behavior of the
# config.*.yaml file it exists in.

# Many ddev commands can be extended to run tasks before or after the
# ddev command is executed, for example "post-start", "post-import-db",
# "pre-composer", "post-composer"
# See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/ for more
# information on the commands that can be extended and the tasks you can define
# for them. Example:
#hooks:
# post-import-db:
# - exec: drush cr
# - exec: drush updb
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
options: '--network-alias drupal8ci'
services:
selenium:
image: selenium/standalone-chrome
image: selenium/standalone-chrome:115.0
options: '--shm-size="2g"'
mysql:
image: mysql:5.7
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -160,3 +160,9 @@ drush/sites/.checksums

# Deprecation detector rules
.rules

#Ddev
docroot/sites/*/settings/settings.ddev.php

# Ignore sdssrooms site specific modules
docroot/sites/sdssrooms/modules/*
33 changes: 33 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,38 @@
# ACE SDSSGryphon

2.2.0
--------------------------------------------------------------------------------
_Release Date: 2023-09-27_

- 493dd2a SDSS-973: Change dash to underscore in blt.yml for abc_hub (#244)
- e08da09 SDSS-969: Disabled JSON API module (#242)
- 2466773 SDSS-888: Swapping abchub with abc-hub (#239)
- f06dade SDSS-943: Pointed techtransferfordefense to hackingfordefense site (#240)
- d0dc2c2 SDSS-594-885: Added media contacts entity, field, styles and displays (#217) (#219)
- 06d6b78 SDSS-843: Added the stanford_earth_r25 module to sdssroom site only. (#237)
- bee9507 SDSS-937: NEWS | Added top margin to related news section (#235)
- b8d1b0b SDSS-851: A11y | Added decorative blue text color for improved accessibility (#234)
- 8a4c240 SDSS-842: Provision SDSS Rooms (#236)
- f061137 SDSS-477: A11Y | Fixed button text color on Event pages (#233)
- 3091c40 SDSS-451, SDSS-452: Adjust margin and padding for color variant paragraph rows (#232)
- 3bacc1e SDSS-175: Reduce font-size on default list filter by menu (#231)
- d4f8729 SDSS-900: Fix callout quote symbols for Windows (#230)
- 88953c6 SDSS-888: Provisioned abchub (#229)
- f89bf12 SDSS-000: DEV | Add ddev configuration for local environments (#228)
- fb0303d SDSS-520: Updated Localist migration to import images (#227)
- 916ea46 SDSS-814: News Article Design QA Updates (#193)
- 849dddd SDSS-901: News | Vertical Teaser Card QA Updates (#222)
- 5f99b4c SDSS-902: NEWS | Update byline and date font size on News node displays (#224)
- e2d4b03 SDSS-906: Lock seleinium chrome-driver version (#226)
- 45416f9 SDSS-886: Added nid data to RSS feed as unique identifier (#225)
- 80ac02f SDSS-900: Callout Quote | Use serif font and smart quotes (#221)
- efecbfe SDSS-846: A11y | Updates to News Vertical Card component (#220)
- e498542 SDSS-877: Fix News article top text alignment issue (#218)
- 857eec2 SDSS-827: Adjusted Callout Quote component alignment (#209)
- ed710e2 SDSS-875: News article node display updates. (#216)
- 91ee2b3 SDSS-821: Adjusted dek line height on News nodes (#213)


2.1.1
--------------------------------------------------------------------------------
_Release Date: 2023-08-17_
Expand Down
2 changes: 2 additions & 0 deletions blt/blt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ cm:
strategy: config-split
allow-overrides: true
multisites:
- abc_hub
- bitsandwatts
- carbon_removal
- changeleadership
Expand Down Expand Up @@ -55,6 +56,7 @@ multisites:
- planetary
- scv
- sdss_config_capture
- sdssrooms
- sdsssandbox
- sdssuserguide
- seca
Expand Down
19 changes: 18 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,26 @@
"package": {
"name": "su-sws/earth_news_importer",
"version": "1.x-dev",
"type": "drupal-module",
"type": "drupal-custom-module",
"source": {
"type": "git",
"url": "https://github.com/SU-SWS/earth_news_importer.git",
"reference": "1.x"
}
}
},
{
"type": "package",
"package": {
"name": "stanford-earth/stanford_earth_r25",
"version": "8.1.6",
"type": "drupal-custom-module-rooms-site",
"source": {
"type": "git",
"url": "https://github.com/stanford-earth/stanford_earth_r25",
"reference": "8.1.6"
}
}
}
],
"require": {
Expand Down Expand Up @@ -249,6 +262,7 @@
"sainsburys/guzzle-oauth2-plugin": "^3.0",
"seboettg/citeproc-php": "2.4.1",
"simplesamlphp/simplesamlphp": "^1.19",
"stanford-earth/stanford_earth_r25": "^8.1",
"su-sws/drupal-patches": "^8.1",
"su-sws/earth_news_importer": "1.x-dev",
"su-sws/nobots": "^8.2",
Expand Down Expand Up @@ -329,6 +343,9 @@
],
"docroot/themes/custom/{$name}": [
"type:drupal-custom-theme"
],
"docroot/sites/sdssrooms/modules/{$name}": [
"type:drupal-custom-module-rooms-site"
]
},
"custom-installer": {
Expand Down
Loading

0 comments on commit ec02ac9

Please sign in to comment.