diff --git a/.ddev/commands/host/theme b/.ddev/commands/host/theme deleted file mode 100755 index 6cc5fa4..0000000 --- a/.ddev/commands/host/theme +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -## Description: Helper commands for the for theme -## Usage: theme build|dev|install|ssh|watch - -set -e - -THEME_PATH="/var/www/html/$DDEV_DOCROOT/themes/custom/opdavies" - -case $1 in - build|prod|production) - ddev theme install - ddev exec -d $THEME_PATH npm run production - ;; - - dev|development) - ddev theme install - ddev exec -d $THEME_PATH npm run development - ;; - - install) - ddev exec -d $THEME_PATH npm ci - ;; - - ssh) - ddev ssh -d $THEME_PATH - ;; - - watch) - ddev theme install - ddev exec -d $THEME_PATH npm run watch - ;; - - *) - echo "Invalid argument: $1" - ;; -esac diff --git a/.ddev/commands/web/app b/.ddev/commands/web/app deleted file mode 100755 index ea6d40d..0000000 --- a/.ddev/commands/web/app +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -## Description: Helper commands for the for theme -## Usage: app install|refresh - -set -e - -if [ $# -eq 0 ] ; then - echo 'No arguments entered.' - exit 1 -fi - -case $1 in - install) - drush site:install -y --account-pass=admin123 --existing-config - drush user:login - touch .flag-built - ;; - - refresh) - drush config-import -y - drush cache-rebuild - ;; - - *) - echo "Invalid argument: $1" - ;; -esac diff --git a/.ddev/commands/web/phpunit b/.ddev/commands/web/phpunit deleted file mode 100755 index b2f7450..0000000 --- a/.ddev/commands/web/phpunit +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## Description: Run PHPUnit tests inside the web container. -## Usage: phpunit -## Example: "ddev phpunit" or with additional arguments such as "ddev phpunit --testdox" - -vendor/bin/phpunit $* diff --git a/.ddev/config.yaml b/.ddev/config.yaml deleted file mode 100644 index 1b6ddd3..0000000 --- a/.ddev/config.yaml +++ /dev/null @@ -1,184 +0,0 @@ -name: oliverdavies -type: drupal8 -docroot: web -php_version: "7.4" -webserver_type: nginx-fpm -router_http_port: "80" -router_https_port: "443" -xdebug_enabled: false -additional_hostnames: [] -additional_fqdns: [] -mariadb_version: "10.2" -mysql_version: "" -provider: default -hooks: - post-import-db: - - exec: drush sql-sanitize -y --sanitize-password=password - - exec: drush cr - - exec: drush updb - post-start: - - exec: '[[ ! -f .flag-built ]] && composer install || exit 0' - - exec-host: '[[ ! -f .flag-built ]] && ddev theme development || exit 0' -working_dir: - web: /var/www/html -use_dns_when_possible: true -composer_version: "2" -omit_containers: [dba] - -# This config.yaml was created with ddev version v1.16.1 -# webimage: drud/ddev-webserver:v1.16.1 -# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.16.0 -# dbaimage: phpmyadmin:5 -# However we do not recommend explicitly wiring these images into the -# config.yaml as they may break future versions of ddev. -# You can update this config.yaml using 'ddev config'. - -# Key features of ddev's config.yaml: - -# name: # Name of the project, automatically provides -# http://projectname.ddev.site and https://projectname.ddev.site - -# type: # drupal6/7/8, backdrop, typo3, wordpress, php - -# docroot: # Relative path to the directory containing index.php. - -# php_version: "7.3" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" "8.0" - -# You can explicitly specify the webimage, dbimage, dbaimage lines but this -# is not recommended, as the images are often closely tied to ddev's' behavior, -# so this can break upgrades. - -# webimage: # nginx/php docker image. -# dbimage: # mariadb docker image. -# dbaimage: - -# mariadb_version and mysql_version -# ddev can use many versions of mariadb and mysql -# However these directives are mutually exclusive -# mariadb_version: 10.2 -# mysql_version: 8.0 - -# router_http_port: # Port to be used for http (defaults to port 80) -# router_https_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. - -# 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_version: "2" -# if composer_version:"" it will use the current ddev default composer release. -# It can also be set to "1", to get most recent composer v1 -# or "2" for most recent composer v2. -# It can be set to any existing specific composer version. -# After first project 'ddev start' this will not be updated until it changes - -# 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 custom/upload/dir. - -# 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. - -# nfs_mount_enabled: false -# Great performance improvement but requires host configuration first. -# See https://ddev.readthedocs.io/en/stable/users/performance/#using-nfs-to-mount-the-project-into-the-container - -# 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 - -# mailhog_port: "8025" -# mailhog_https_port: "8026" -# The MailHog ports can be changed from the default 8025 and 8026 - -# webimage_extra_packages: [php7.3-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: --subdomain mysite --auth username:pass -# 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 AdditionalSettings.php -# In this case the user must provide all such settings. - -# 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! - -# provider: default # Currently either "default" or "pantheon" -# -# 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/extending-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 diff --git a/.gitignore b/.gitignore index b556556..fb87d60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ * !*/ -!/.ddev/** !/.gitignore !/**/.gitkeep !/.github/** diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php index 96d7668..be25020 100644 --- a/web/sites/default/settings.php +++ b/web/sites/default/settings.php @@ -764,7 +764,3 @@ if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) { include $app_root . '/' . $site_path . '/settings.local.php'; } -// Automatically generated include for settings managed by ddev. -if (file_exists($app_root . '/' . $site_path . '/settings.ddev.php') && getenv('IS_DDEV_PROJECT') == 'true') { - include $app_root . '/' . $site_path . '/settings.ddev.php'; -}