From f89bc3620cb75bc7a0c9fb4271013d8d3b417ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Sun, 19 Jan 2020 18:30:14 +0100 Subject: [PATCH 1/6] Add ddev config --- .ddev/config.yaml | 159 +++++++++++++++++++++++++++++ .ddev/docker-compose.env.yaml | 6 ++ config/sites/ep-reisen/config.yaml | 3 + public/typo3conf/.gitignore | 5 + 4 files changed, 173 insertions(+) create mode 100644 .ddev/config.yaml create mode 100644 .ddev/docker-compose.env.yaml create mode 100644 public/typo3conf/.gitignore diff --git a/.ddev/config.yaml b/.ddev/config.yaml new file mode 100644 index 00000000..9aee87d0 --- /dev/null +++ b/.ddev/config.yaml @@ -0,0 +1,159 @@ +APIVersion: v1.12.1 +name: ep-reisen-web +type: typo3 +docroot: public +php_version: "7.3" +webserver_type: nginx-fpm +router_http_port: "80" +router_https_port: "443" +xdebug_enabled: false +additional_hostnames: [] +additional_fqdns: [] +nfs_mount_enabled: true +provider: default +use_dns_when_possible: true +timezone: "" + + +# This config.yaml was created with ddev version v1.12.1 +# webimage: drud/ddev-webserver:v1.12.1 +# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.12.0 +# dbaimage: drud/phpmyadmin:v1.12.0 +# bgsyncimage: drud/ddev-bgsync:v1.12.0 +# 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.2" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" + +# 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: +# bgsyncimage: + +# 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 exec enable_xdebug" and "ddev exec disable_xdebug" work better, +# as leaving xdebug enabled all the time is a big performance hit. + +# webserver_type: nginx-fpm # Can be set to apache-fpm or apache-cgi as well + +# 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 + +# 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: ["dba", "ddev-ssh-agent"] +# would omit the dba (phpMyAdmin) and ddev-ssh-agent containers. Currently +# only those two containers can be omitted here. +# Note that these containers can also be omitted globally in the +# ~/.ddev/global_config.yaml or with the "ddev config global" command. + +# 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 + +# webcache_enabled: false (deprecated) +# Was only for macOS, but now deprecated. +# See https://ddev.readthedocs.io/en/stable/users/performance/#webcache + +# 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: "1000" +# The PHPMyAdmin port can be changed from the default 8036 + +# mailhog_port: "1001" +# The MailHog port can be changed from the default 8025 + +# webimage_extra_packages: [php-yaml, php7.3-ldap] +# 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" + +# 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-start: +# - exec: composer install -d /var/www/html diff --git a/.ddev/docker-compose.env.yaml b/.ddev/docker-compose.env.yaml new file mode 100644 index 00000000..06dca63f --- /dev/null +++ b/.ddev/docker-compose.env.yaml @@ -0,0 +1,6 @@ +version: '3.6' + +services: + web: + environment: + - TYPO3_CONTEXT=Development/Ddev \ No newline at end of file diff --git a/config/sites/ep-reisen/config.yaml b/config/sites/ep-reisen/config.yaml index 1c876d72..6d2ff1b1 100644 --- a/config/sites/ep-reisen/config.yaml +++ b/config/sites/ep-reisen/config.yaml @@ -6,6 +6,9 @@ baseVariants: - base: 'https://schnee-event.burn.dpn' condition: 'applicationContext == "Development/Skimax"' + - + base: 'https://ep-reisen-web.ddev.site' + condition: 'applicationContext == "Development/Ddev"' disableStaticFileCache: true errorHandling: - diff --git a/public/typo3conf/.gitignore b/public/typo3conf/.gitignore new file mode 100644 index 00000000..2f83a7c7 --- /dev/null +++ b/public/typo3conf/.gitignore @@ -0,0 +1,5 @@ +#ddev-generated: Automatically generated ddev .gitignore. +# You can remove the above line if you want to edit and maintain this file yourself. + +/AdditionalConfiguration.php +/drushrc.php From 1beadfaa24b9e242a636f550cb43c9499aee0fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Fri, 24 Jan 2020 11:37:15 +0100 Subject: [PATCH 2/6] Refine ddev config --- .ddev/.dbimageBuild/Dockerfile | 9 ++ .ddev/.sshimageBuild/Dockerfile | 9 ++ .ddev/.webimageBuild/Dockerfile | 9 ++ .ddev/commands/db/README.txt | 16 ++ .ddev/commands/db/mysql | 9 ++ .ddev/commands/db/mysqldump.example | 8 + .ddev/commands/host/README.txt | 18 +++ .ddev/commands/host/launch | 28 ++++ .ddev/commands/host/mysqlworkbench.example | 32 ++++ .ddev/commands/host/phpstorm.example | 9 ++ .ddev/commands/host/solrtail.example | 11 ++ .ddev/commands/solr/README.txt | 24 +++ .ddev/commands/solr/solrtail.example | 13 ++ .ddev/commands/web/README.txt | 20 +++ .ddev/commands/web/drush.example | 8 + .ddev/commands/web/reload-nginx.example | 8 + .ddev/config.yaml | 150 +----------------- .ddev/docker-compose.yaml | 176 +++++++++++++++++++++ 18 files changed, 410 insertions(+), 147 deletions(-) create mode 100644 .ddev/.dbimageBuild/Dockerfile create mode 100644 .ddev/.sshimageBuild/Dockerfile create mode 100644 .ddev/.webimageBuild/Dockerfile create mode 100755 .ddev/commands/db/README.txt create mode 100755 .ddev/commands/db/mysql create mode 100755 .ddev/commands/db/mysqldump.example create mode 100755 .ddev/commands/host/README.txt create mode 100755 .ddev/commands/host/launch create mode 100755 .ddev/commands/host/mysqlworkbench.example create mode 100755 .ddev/commands/host/phpstorm.example create mode 100755 .ddev/commands/host/solrtail.example create mode 100755 .ddev/commands/solr/README.txt create mode 100755 .ddev/commands/solr/solrtail.example create mode 100755 .ddev/commands/web/README.txt create mode 100755 .ddev/commands/web/drush.example create mode 100755 .ddev/commands/web/reload-nginx.example create mode 100644 .ddev/docker-compose.yaml diff --git a/.ddev/.dbimageBuild/Dockerfile b/.ddev/.dbimageBuild/Dockerfile new file mode 100644 index 00000000..a5f1b48d --- /dev/null +++ b/.ddev/.dbimageBuild/Dockerfile @@ -0,0 +1,9 @@ + +ARG BASE_IMAGE +FROM $BASE_IMAGE + +ARG username +ARG uid +ARG gid +RUN (groupadd --gid $gid "$username" || groupadd "$username" || true) && (useradd -l -m -s "/bin/bash" --gid "$username" --comment '' --uid $uid "$username" || useradd -l -m -s "/bin/bash" --gid "$username" --comment '' "$username") + \ No newline at end of file diff --git a/.ddev/.sshimageBuild/Dockerfile b/.ddev/.sshimageBuild/Dockerfile new file mode 100644 index 00000000..a5f1b48d --- /dev/null +++ b/.ddev/.sshimageBuild/Dockerfile @@ -0,0 +1,9 @@ + +ARG BASE_IMAGE +FROM $BASE_IMAGE + +ARG username +ARG uid +ARG gid +RUN (groupadd --gid $gid "$username" || groupadd "$username" || true) && (useradd -l -m -s "/bin/bash" --gid "$username" --comment '' --uid $uid "$username" || useradd -l -m -s "/bin/bash" --gid "$username" --comment '' "$username") + \ No newline at end of file diff --git a/.ddev/.webimageBuild/Dockerfile b/.ddev/.webimageBuild/Dockerfile new file mode 100644 index 00000000..a5f1b48d --- /dev/null +++ b/.ddev/.webimageBuild/Dockerfile @@ -0,0 +1,9 @@ + +ARG BASE_IMAGE +FROM $BASE_IMAGE + +ARG username +ARG uid +ARG gid +RUN (groupadd --gid $gid "$username" || groupadd "$username" || true) && (useradd -l -m -s "/bin/bash" --gid "$username" --comment '' --uid $uid "$username" || useradd -l -m -s "/bin/bash" --gid "$username" --comment '' "$username") + \ No newline at end of file diff --git a/.ddev/commands/db/README.txt b/.ddev/commands/db/README.txt new file mode 100755 index 00000000..97e4fd6b --- /dev/null +++ b/.ddev/commands/db/README.txt @@ -0,0 +1,16 @@ +Scripts in this directory will be executed inside the db +container. A number of environment variables are supplied to the scripts, including: + +DDEV_APPROOT: file system location of the project on the host) +DDEV_HOST_DB_PORT: Localhost port of the database server +DDEV_HOST_WEBSERVER_PORT: Localhost port of the webserver +DDEV_HOST_HTTPS_PORT: Localhost port for https on webserver +DDEV_DOCROOT: Relative path from approot to docroot +DDEV_HOSTNAME: Comma-separated list of FQDN hostnames +DDEV_PHP_VERSION +DDEV_WEBSERVER_TYPE: nginx-fpm, apache-fpm, apache-cgi +DDEV_PROJECT_TYPE: drupal8, typo3, backdrop, wordpress, etc. +DDEV_ROUTER_HTTP_PORT: Router port for http +DDEV_ROUTER_HTTPS_PORT: Router port for https + +More environment variables may be available, see https://github.com/drud/ddev/blob/52c7915dee41d4846f9f619520b726994c0372c5/pkg/ddevapp/ddevapp.go#L1006-L1030 diff --git a/.ddev/commands/db/mysql b/.ddev/commands/db/mysql new file mode 100755 index 00000000..23a06dbd --- /dev/null +++ b/.ddev/commands/db/mysql @@ -0,0 +1,9 @@ +#!/bin/bash + +## #ddev-generated +## Description: run mysql client in db container +## Usage: mysql [flags] [args] +## Example: "ddev mysql" or "ddev mysql -uroot -proot" or "echo 'SHOW TABLES;' | ddev mysql" +## `ddev mysql --database=mysql -uroot -proot` gets you to the 'mysql' database with root privileges + +mysql -udb -pdb $@ diff --git a/.ddev/commands/db/mysqldump.example b/.ddev/commands/db/mysqldump.example new file mode 100755 index 00000000..63fd1d49 --- /dev/null +++ b/.ddev/commands/db/mysqldump.example @@ -0,0 +1,8 @@ +#!/bin/bash + +## #ddev-generated +## Description: run mysqldump in web container +## Usage: mysqldump [flags] [args] +## Example: "ddev mysqldump db" or "ddev mysqldump otherdb" or "ddev mysqldump db | gzip >db.sql.gz" + +mysqldump -uroot -proot $@ diff --git a/.ddev/commands/host/README.txt b/.ddev/commands/host/README.txt new file mode 100755 index 00000000..773f9803 --- /dev/null +++ b/.ddev/commands/host/README.txt @@ -0,0 +1,18 @@ +Scripts in this directory will be executed on the host +but they can take easily take action on containers by using +`ddev exec`. A number of environment variables are supplied to the scripts +including: + +DDEV_APPROOT: file system location of the project on the host) +DDEV_HOST_DB_PORT: Localhost port of the database server +DDEV_HOST_WEBSERVER_PORT: Localhost port of the webserver +DDEV_HOST_HTTPS_PORT: Localhost port for https on webserver +DDEV_DOCROOT: Relative path from approot to docroot +DDEV_HOSTNAME: Comma-separated list of FQDN hostnames +DDEV_PHP_VERSION +DDEV_WEBSERVER_TYPE: nginx-fpm, apache-fpm, apache-cgi +DDEV_PROJECT_TYPE: drupal8, typo3, backdrop, wordpress, etc. +DDEV_ROUTER_HTTP_PORT: Router port for http +DDEV_ROUTER_HTTPS_PORT: Router port for https + +More environment variables may be available, see https://github.com/drud/ddev/blob/52c7915dee41d4846f9f619520b726994c0372c5/pkg/ddevapp/ddevapp.go#L1006-L1030 diff --git a/.ddev/commands/host/launch b/.ddev/commands/host/launch new file mode 100755 index 00000000..37db084b --- /dev/null +++ b/.ddev/commands/host/launch @@ -0,0 +1,28 @@ +#!/bin/bash + +## #ddev-generated +## Description: Launch a browser with the current site +## Usage: launch [path] +## Example: "ddev launch" or "ddev launch /admin/reports/status/php" or "ddev launch phpinfo.php" + +FULLURL=${DDEV_PRIMARY_URL} + +if [ -n "${1:-}" ] ; then + if [[ ${1::1} != "/" ]] ; then + FULLURL="${FULLURL}/"; + fi + + FULLURL="${FULLURL}${1}"; +fi + +case $OSTYPE in + linux-gnu) + xdg-open ${FULLURL} + ;; + "darwin"*) + open ${FULLURL} + ;; + "win*"* | "msys"*) + start ${FULLURL} + ;; +esac diff --git a/.ddev/commands/host/mysqlworkbench.example b/.ddev/commands/host/mysqlworkbench.example new file mode 100755 index 00000000..a4e349ae --- /dev/null +++ b/.ddev/commands/host/mysqlworkbench.example @@ -0,0 +1,32 @@ +#!/bin/bash + +## #ddev-generated +## Description: Run MySQLWorkbench against current db +## Usage: mysqlworkbench +## Example: "ddev mysqlworkbench" + +# Note that this examle uses $DDEV_HOST_DB_PORT to get the port for the connection +# Mysql Workbench can be obtained from https://dev.mysql.com/downloads/workbench/ + +query="root:root@127.0.0.1:${DDEV_HOST_DB_PORT}" + +case $OSTYPE in + linux-gnu) + # You may need "apt-get install libproj-dev gnome-keyring" if it complains about those + mysql-workbench --query "$query" & + echo "Attempted to launch mysql-workbench" + ;; + + "darwin"*) + "/Applications/MySQLWorkbench.app/Contents/MacOS/MySQLWorkbench" --query "$query" & + echo "Attempted to launch MySQLWorkbench.app" + ;; + + "win*"* | "msys"*) + # 'C:\Program Files\MySQL\MySQL Workbench 8.0 CE\mysqlworkbench.exe' + # You may need to add it to your system %PATH% or change the path here + # On docker toolbox you'll need to change the query to use the toolbox IP address, + # likely 192.168.99.100 + 'C:\Program Files\MySQL\MySQL Workbench 8.0 CE\mysqlworkbench.exe' --query "$query" + #;; +esac diff --git a/.ddev/commands/host/phpstorm.example b/.ddev/commands/host/phpstorm.example new file mode 100755 index 00000000..45725376 --- /dev/null +++ b/.ddev/commands/host/phpstorm.example @@ -0,0 +1,9 @@ +#!/bin/bash + +## #ddev-generated +## Description: Open PHPStorm with the current project +## Usage: phpstorm +## Example: "ddev phpstorm" + +# Example is macOS-specific, but easy to adapt to any OS +open -a PHPStorm.app ${DDEV_APPROOT} diff --git a/.ddev/commands/host/solrtail.example b/.ddev/commands/host/solrtail.example new file mode 100755 index 00000000..2abee14e --- /dev/null +++ b/.ddev/commands/host/solrtail.example @@ -0,0 +1,11 @@ +#!/bin/bash + +## #ddev-generated +## Description: Tail the main solr log +## Usage: solrtail +## Example: ddev solrtail + +# This can't work unless you have a solr service, +# See https://ddev.readthedocs.io/en/stable/users/extend/additional-services/#apache-solr + +ddev exec -s solr tail -40lf /opt/solr/server/logs/solr.log diff --git a/.ddev/commands/solr/README.txt b/.ddev/commands/solr/README.txt new file mode 100755 index 00000000..da5bb83f --- /dev/null +++ b/.ddev/commands/solr/README.txt @@ -0,0 +1,24 @@ +Scripts in this directory will be executed inside the solr +container (if it exists, of course). This is just an example, +but any named service can have a directory with commands. + +Note that /mnt/ddev_config must be mounted into the 3rd-party service +with a stanza like this in the docker-compose.solr.yaml: + + volumes: + - type: "bind" + source: "." + target: "/mnt/ddev_config" + + +A number of environment variables are supplied to the scripts, including: + +DDEV_DOCROOT: Relative path from approot to docroot +DDEV_HOSTNAME: Comma-separated list of FQDN hostnames +DDEV_PHP_VERSION +DDEV_WEBSERVER_TYPE: nginx-fpm, apache-fpm, apache-cgi +DDEV_PROJECT_TYPE: drupal8, typo3, backdrop, wordpress, etc. +DDEV_ROUTER_HTTP_PORT: Router port for http +DDEV_ROUTER_HTTPS_PORT: Router port for https + +More environment variables may be available, see https://github.com/drud/ddev/blob/52c7915dee41d4846f9f619520b726994c0372c5/pkg/ddevapp/ddevapp.go#L1006-L1030 diff --git a/.ddev/commands/solr/solrtail.example b/.ddev/commands/solr/solrtail.example new file mode 100755 index 00000000..309a07a7 --- /dev/null +++ b/.ddev/commands/solr/solrtail.example @@ -0,0 +1,13 @@ +#!/bin/bash + +## #ddev-generated +## Description: Tail the main solr log +## Usage: solrtail +## Example: ddev solrtail + +# This example runs inside the solr container. +# Note that this requires that /mnt/ddev_config be mounted +# into the solr container and of course that you have a container +# named solr. + +tail -f /opt/solr/server/logs/solr.log diff --git a/.ddev/commands/web/README.txt b/.ddev/commands/web/README.txt new file mode 100755 index 00000000..9847dc1f --- /dev/null +++ b/.ddev/commands/web/README.txt @@ -0,0 +1,20 @@ +Scripts in this directory will be executed inside the web +container. You can copy the example file or just rename it: +`mv drush.example drush`, for example, and it will become +a live command. + +A number of environment variables are supplied to the scripts, including: + +DDEV_APPROOT: file system location of the project on the host) +DDEV_HOST_DB_PORT: Localhost port of the database server +DDEV_HOST_WEBSERVER_PORT: Localhost port of the webserver +DDEV_HOST_HTTPS_PORT: Localhost port for https on webserver +DDEV_DOCROOT: Relative path from approot to docroot +DDEV_HOSTNAME: Comma-separated list of FQDN hostnames +DDEV_PHP_VERSION +DDEV_WEBSERVER_TYPE: nginx-fpm, apache-fpm, apache-cgi +DDEV_PROJECT_TYPE: drupal8, typo3, backdrop, wordpress, etc. +DDEV_ROUTER_HTTP_PORT: Router port for http +DDEV_ROUTER_HTTPS_PORT: Router port for https + +More environment variables may be available, see https://github.com/drud/ddev/blob/52c7915dee41d4846f9f619520b726994c0372c5/pkg/ddevapp/ddevapp.go#L1006-L1030 diff --git a/.ddev/commands/web/drush.example b/.ddev/commands/web/drush.example new file mode 100755 index 00000000..3c65a0f7 --- /dev/null +++ b/.ddev/commands/web/drush.example @@ -0,0 +1,8 @@ +#!/bin/bash + +## #ddev-generated +## Description: Run drush inside the web container +## Usage: drush [flags] [args] +## Example: "ddev drush uli" or "ddev drush sql-cli" or "ddev drush --version" + +drush $@ diff --git a/.ddev/commands/web/reload-nginx.example b/.ddev/commands/web/reload-nginx.example new file mode 100755 index 00000000..f70cc97e --- /dev/null +++ b/.ddev/commands/web/reload-nginx.example @@ -0,0 +1,8 @@ +#!/bin/bash + +## #ddev-generated +## Description: Reload config for nginx and php-fpm inside web container +## Usage: restart-nginx +## Example: "ddev restart-nginx" + +killall -HUP nginx php-fpm diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 9aee87d0..cc4dfbcf 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -1,9 +1,9 @@ APIVersion: v1.12.1 -name: ep-reisen-web +name: ep-reisen type: typo3 docroot: public php_version: "7.3" -webserver_type: nginx-fpm +webserver_type: apache-cgi router_http_port: "80" router_https_port: "443" xdebug_enabled: false @@ -12,148 +12,4 @@ additional_fqdns: [] nfs_mount_enabled: true provider: default use_dns_when_possible: true -timezone: "" - - -# This config.yaml was created with ddev version v1.12.1 -# webimage: drud/ddev-webserver:v1.12.1 -# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.12.0 -# dbaimage: drud/phpmyadmin:v1.12.0 -# bgsyncimage: drud/ddev-bgsync:v1.12.0 -# 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.2" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" - -# 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: -# bgsyncimage: - -# 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 exec enable_xdebug" and "ddev exec disable_xdebug" work better, -# as leaving xdebug enabled all the time is a big performance hit. - -# webserver_type: nginx-fpm # Can be set to apache-fpm or apache-cgi as well - -# 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 - -# 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: ["dba", "ddev-ssh-agent"] -# would omit the dba (phpMyAdmin) and ddev-ssh-agent containers. Currently -# only those two containers can be omitted here. -# Note that these containers can also be omitted globally in the -# ~/.ddev/global_config.yaml or with the "ddev config global" command. - -# 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 - -# webcache_enabled: false (deprecated) -# Was only for macOS, but now deprecated. -# See https://ddev.readthedocs.io/en/stable/users/performance/#webcache - -# 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: "1000" -# The PHPMyAdmin port can be changed from the default 8036 - -# mailhog_port: "1001" -# The MailHog port can be changed from the default 8025 - -# webimage_extra_packages: [php-yaml, php7.3-ldap] -# 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" - -# 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-start: -# - exec: composer install -d /var/www/html +timezone: "Europe/Berlin" diff --git a/.ddev/docker-compose.yaml b/.ddev/docker-compose.yaml new file mode 100644 index 00000000..24f721a1 --- /dev/null +++ b/.ddev/docker-compose.yaml @@ -0,0 +1,176 @@ +version: '3.6' +#ddev-generated +services: + + db: + container_name: ddev-${DDEV_SITENAME}-db + build: + context: '/Users/fromme/www/ep-reisen-web/.ddev/.dbimageBuild' + args: + BASE_IMAGE: $DDEV_DBIMAGE + username: 'fromme' + uid: '501' + gid: '20' + image: ${DDEV_DBIMAGE}-built + stop_grace_period: 60s + volumes: + - type: "volume" + source: mariadb-database + target: "/var/lib/mysql" + volume: + nocopy: true + - type: "bind" + source: "." + target: "/mnt/ddev_config" + - ddev-global-cache:/mnt/ddev-global-cache + restart: "no" + user: "$DDEV_UID:$DDEV_GID" + hostname: ep-reisen-web-db + ports: + - "127.0.0.1:$DDEV_HOST_DB_PORT:3306" + labels: + com.ddev.site-name: ${DDEV_SITENAME} + com.ddev.platform: ddev + com.ddev.app-type: typo3 + com.ddev.approot: $DDEV_APPROOT + environment: + - COLUMNS=$COLUMNS + - LINES=$LINES + - TZ= + - DDEV_PROJECT=ep-reisen-web + command: "$DDEV_MARIADB_LOCAL_COMMAND" + healthcheck: + interval: 1s + retries: 30 + start_period: 20s + timeout: 120s + + web: + container_name: ddev-${DDEV_SITENAME}-web + build: + context: '/Users/fromme/www/ep-reisen-web/.ddev/.webimageBuild' + args: + BASE_IMAGE: $DDEV_WEBIMAGE + username: 'fromme' + uid: '501' + gid: '20' + image: ${DDEV_WEBIMAGE}-built + cap_add: + - SYS_PTRACE + volumes: + - type: volume + source: nfsmount + target: /var/www/html + + volume: + nocopy: true + + - ".:/mnt/ddev_config:ro" + - ddev-global-cache:/mnt/ddev-global-cache + + - ddev-ssh-agent_socket_dir:/home/.ssh-agent + + + restart: "no" + user: "$DDEV_UID:$DDEV_GID" + hostname: ep-reisen-web-web + + links: + - db:db + + # ports is list of exposed *container* ports + ports: + - "127.0.0.1:$DDEV_HOST_WEBSERVER_PORT:80" + - "127.0.0.1:$DDEV_HOST_HTTPS_PORT:443" + environment: + - DOCROOT=$DDEV_DOCROOT + - DDEV_PHP_VERSION=$DDEV_PHP_VERSION + - DDEV_WEBSERVER_TYPE=$DDEV_WEBSERVER_TYPE + - DDEV_PROJECT_TYPE=$DDEV_PROJECT_TYPE + - DDEV_ROUTER_HTTP_PORT=$DDEV_ROUTER_HTTP_PORT + - DDEV_ROUTER_HTTPS_PORT=$DDEV_ROUTER_HTTPS_PORT + - DDEV_XDEBUG_ENABLED=$DDEV_XDEBUG_ENABLED + - DOCKER_IP=127.0.0.1 + - HOST_DOCKER_INTERNAL_IP= + - DEPLOY_NAME=local + - VIRTUAL_HOST=$DDEV_HOSTNAME + - COLUMNS=$COLUMNS + - LINES=$LINES + - TZ= + # HTTP_EXPOSE allows for ports accepting HTTP traffic to be accessible from .ddev.site: + # To expose a container port to a different host port, define the port as hostPort:containerPort + - HTTP_EXPOSE=${DDEV_ROUTER_HTTP_PORT}:80,${DDEV_MAILHOG_PORT}:8025 + # You can optionally expose an HTTPS port option for any ports defined in HTTP_EXPOSE. + # To expose an HTTPS port, define the port as securePort:containerPort. + - HTTPS_EXPOSE=${DDEV_ROUTER_HTTPS_PORT}:80 + - SSH_AUTH_SOCK=/home/.ssh-agent/socket + - DDEV_PROJECT=ep-reisen-web + labels: + com.ddev.site-name: ${DDEV_SITENAME} + com.ddev.platform: ddev + com.ddev.app-type: typo3 + com.ddev.approot: $DDEV_APPROOT + + external_links: + - "ddev-router:ep-reisen-web.ddev.site" + + healthcheck: + interval: 1s + retries: 10 + start_period: 10s + timeout: 120s + + + + dba: + container_name: ddev-${DDEV_SITENAME}-dba + image: $DDEV_DBAIMAGE + restart: "no" + labels: + com.ddev.site-name: ${DDEV_SITENAME} + com.ddev.platform: ddev + com.ddev.app-type: typo3 + com.ddev.approot: $DDEV_APPROOT + links: + - db:db + ports: + - "80" + hostname: ep-reisen-web-dba + environment: + - PMA_USER=db + - PMA_PASSWORD=db + - VIRTUAL_HOST=$DDEV_HOSTNAME + - TZ= + # HTTP_EXPOSE allows for ports accepting HTTP traffic to be accessible from .ddev.site: + - HTTP_EXPOSE=${DDEV_PHPMYADMIN_PORT}:8036 + healthcheck: + interval: 120s + timeout: 2s + retries: 1 + +networks: + default: + external: + name: ddev_default +volumes: + + mariadb-database: + name: "${DDEV_SITENAME}-mariadb" + + + ddev-ssh-agent_socket_dir: + external: true + + ddev-global-cache: + name: ddev-global-cache + + + nfsmount: + driver: local + driver_opts: + type: nfs + o: "addr=host.docker.internal,hard,nolock,rw" + device: ":/Users/fromme/www/ep-reisen-web" + + + \ No newline at end of file From e7d30d3995767c47a68bfca9d6a2c12d1aa7d6f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Fri, 24 Jan 2020 11:57:12 +0100 Subject: [PATCH 3/6] Update ddev config --- .ddev/config.yaml | 148 +++++++++++++++++++++++++++++++++++++- .ddev/docker-compose.yaml | 24 +++---- 2 files changed, 158 insertions(+), 14 deletions(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index cc4dfbcf..3000f1e1 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -1,4 +1,4 @@ -APIVersion: v1.12.1 +APIVersion: v1.12.2 name: ep-reisen type: typo3 docroot: public @@ -12,4 +12,148 @@ additional_fqdns: [] nfs_mount_enabled: true provider: default use_dns_when_possible: true -timezone: "Europe/Berlin" +timezone: Europe/Berlin + + +# This config.yaml was created with ddev version v1.12.2 +# webimage: drud/ddev-webserver:v1.12.2 +# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.12.0 +# dbaimage: drud/phpmyadmin:v1.12.0 +# bgsyncimage: drud/ddev-bgsync:v1.12.0 +# 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.2" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" + +# 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: +# bgsyncimage: + +# 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 exec enable_xdebug" and "ddev exec disable_xdebug" work better, +# as leaving xdebug enabled all the time is a big performance hit. + +# webserver_type: nginx-fpm # Can be set to apache-fpm or apache-cgi as well + +# 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 + +# 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: ["dba", "ddev-ssh-agent"] +# would omit the dba (phpMyAdmin) and ddev-ssh-agent containers. Currently +# only those two containers can be omitted here. +# Note that these containers can also be omitted globally in the +# ~/.ddev/global_config.yaml or with the "ddev config global" command. + +# 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 + +# webcache_enabled: false (deprecated) +# Was only for macOS, but now deprecated. +# See https://ddev.readthedocs.io/en/stable/users/performance/#webcache + +# 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: "1000" +# The PHPMyAdmin port can be changed from the default 8036 + +# mailhog_port: "1001" +# The MailHog port can be changed from the default 8025 + +# webimage_extra_packages: [php-yaml, php7.3-ldap] +# 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" + +# 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-start: +# - exec: composer install -d /var/www/html diff --git a/.ddev/docker-compose.yaml b/.ddev/docker-compose.yaml index 24f721a1..8b4fab13 100644 --- a/.ddev/docker-compose.yaml +++ b/.ddev/docker-compose.yaml @@ -5,7 +5,7 @@ services: db: container_name: ddev-${DDEV_SITENAME}-db build: - context: '/Users/fromme/www/ep-reisen-web/.ddev/.dbimageBuild' + context: '/Users/fromme/www/ep-reisen/.ddev/.dbimageBuild' args: BASE_IMAGE: $DDEV_DBIMAGE username: 'fromme' @@ -25,7 +25,7 @@ services: - ddev-global-cache:/mnt/ddev-global-cache restart: "no" user: "$DDEV_UID:$DDEV_GID" - hostname: ep-reisen-web-db + hostname: ep-reisen-db ports: - "127.0.0.1:$DDEV_HOST_DB_PORT:3306" labels: @@ -36,8 +36,8 @@ services: environment: - COLUMNS=$COLUMNS - LINES=$LINES - - TZ= - - DDEV_PROJECT=ep-reisen-web + - TZ=Europe/Berlin + - DDEV_PROJECT=ep-reisen command: "$DDEV_MARIADB_LOCAL_COMMAND" healthcheck: interval: 1s @@ -48,7 +48,7 @@ services: web: container_name: ddev-${DDEV_SITENAME}-web build: - context: '/Users/fromme/www/ep-reisen-web/.ddev/.webimageBuild' + context: '/Users/fromme/www/ep-reisen/.ddev/.webimageBuild' args: BASE_IMAGE: $DDEV_WEBIMAGE username: 'fromme' @@ -73,7 +73,7 @@ services: restart: "no" user: "$DDEV_UID:$DDEV_GID" - hostname: ep-reisen-web-web + hostname: ep-reisen-web links: - db:db @@ -96,7 +96,7 @@ services: - VIRTUAL_HOST=$DDEV_HOSTNAME - COLUMNS=$COLUMNS - LINES=$LINES - - TZ= + - TZ=Europe/Berlin # HTTP_EXPOSE allows for ports accepting HTTP traffic to be accessible from .ddev.site: # To expose a container port to a different host port, define the port as hostPort:containerPort - HTTP_EXPOSE=${DDEV_ROUTER_HTTP_PORT}:80,${DDEV_MAILHOG_PORT}:8025 @@ -104,7 +104,7 @@ services: # To expose an HTTPS port, define the port as securePort:containerPort. - HTTPS_EXPOSE=${DDEV_ROUTER_HTTPS_PORT}:80 - SSH_AUTH_SOCK=/home/.ssh-agent/socket - - DDEV_PROJECT=ep-reisen-web + - DDEV_PROJECT=ep-reisen labels: com.ddev.site-name: ${DDEV_SITENAME} com.ddev.platform: ddev @@ -112,7 +112,7 @@ services: com.ddev.approot: $DDEV_APPROOT external_links: - - "ddev-router:ep-reisen-web.ddev.site" + - "ddev-router:ep-reisen.ddev.site" healthcheck: interval: 1s @@ -135,12 +135,12 @@ services: - db:db ports: - "80" - hostname: ep-reisen-web-dba + hostname: ep-reisen-dba environment: - PMA_USER=db - PMA_PASSWORD=db - VIRTUAL_HOST=$DDEV_HOSTNAME - - TZ= + - TZ=Europe/Berlin # HTTP_EXPOSE allows for ports accepting HTTP traffic to be accessible from .ddev.site: - HTTP_EXPOSE=${DDEV_PHPMYADMIN_PORT}:8036 healthcheck: @@ -170,7 +170,7 @@ volumes: driver_opts: type: nfs o: "addr=host.docker.internal,hard,nolock,rw" - device: ":/Users/fromme/www/ep-reisen-web" + device: ":/Users/fromme/www/ep-reisen" \ No newline at end of file From 5cd9d03ab55f1787753a0664acd28587040dccd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Fri, 24 Jan 2020 13:18:42 +0100 Subject: [PATCH 4/6] Extend ddev config for multidomain setup --- .ddev/config.yaml | 152 ++--------------------- .ddev/docker-compose.yaml | 6 + config/sites/ep-events/config.yaml | 36 +++--- config/sites/ep-reisen/config.yaml | 2 +- config/sites/ski-boarderweek/config.yaml | 38 +++--- config/sites/ski-wochenenden/config.yaml | 38 +++--- config/sites/snowzone/config.yaml | 38 +++--- config/sites/unichamp/config.yaml | 38 +++--- public/.htaccess | 19 +-- 9 files changed, 120 insertions(+), 247 deletions(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 3000f1e1..d098edb9 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -7,153 +7,15 @@ webserver_type: apache-cgi router_http_port: "80" router_https_port: "443" xdebug_enabled: false -additional_hostnames: [] +additional_hostnames: + - ep-events + - ski-boarderweek + - snowzone + - unichamp + - ski-wochenenden + - schnee-event additional_fqdns: [] nfs_mount_enabled: true provider: default use_dns_when_possible: true timezone: Europe/Berlin - - -# This config.yaml was created with ddev version v1.12.2 -# webimage: drud/ddev-webserver:v1.12.2 -# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.12.0 -# dbaimage: drud/phpmyadmin:v1.12.0 -# bgsyncimage: drud/ddev-bgsync:v1.12.0 -# 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.2" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" - -# 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: -# bgsyncimage: - -# 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 exec enable_xdebug" and "ddev exec disable_xdebug" work better, -# as leaving xdebug enabled all the time is a big performance hit. - -# webserver_type: nginx-fpm # Can be set to apache-fpm or apache-cgi as well - -# 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 - -# 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: ["dba", "ddev-ssh-agent"] -# would omit the dba (phpMyAdmin) and ddev-ssh-agent containers. Currently -# only those two containers can be omitted here. -# Note that these containers can also be omitted globally in the -# ~/.ddev/global_config.yaml or with the "ddev config global" command. - -# 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 - -# webcache_enabled: false (deprecated) -# Was only for macOS, but now deprecated. -# See https://ddev.readthedocs.io/en/stable/users/performance/#webcache - -# 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: "1000" -# The PHPMyAdmin port can be changed from the default 8036 - -# mailhog_port: "1001" -# The MailHog port can be changed from the default 8025 - -# webimage_extra_packages: [php-yaml, php7.3-ldap] -# 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" - -# 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-start: -# - exec: composer install -d /var/www/html diff --git a/.ddev/docker-compose.yaml b/.ddev/docker-compose.yaml index 8b4fab13..b2ce8757 100644 --- a/.ddev/docker-compose.yaml +++ b/.ddev/docker-compose.yaml @@ -112,7 +112,13 @@ services: com.ddev.approot: $DDEV_APPROOT external_links: + - "ddev-router:ep-events.ddev.site" - "ddev-router:ep-reisen.ddev.site" + - "ddev-router:schnee-event.ddev.site" + - "ddev-router:ski-boarderweek.ddev.site" + - "ddev-router:ski-wochenenden.ddev.site" + - "ddev-router:snowzone.ddev.site" + - "ddev-router:unichamp.ddev.site" healthcheck: interval: 1s diff --git a/config/sites/ep-events/config.yaml b/config/sites/ep-events/config.yaml index a9802b33..0a9d4b6e 100644 --- a/config/sites/ep-events/config.yaml +++ b/config/sites/ep-events/config.yaml @@ -1,9 +1,17 @@ -rootPageId: 884 base: 'https://www.ep-events.de' baseVariants: - base: 'https://ep-events.burn.dpn' condition: 'applicationContext == "Development"' + - + base: 'https://ep-events.ddev.site' + condition: 'applicationContext == "Development/Ddev"' +disableStaticFileCache: false +errorHandling: + - + errorCode: '404' + errorHandler: Page + errorContentSource: 't3://page?uid=608' languages: - title: Deutsch @@ -31,16 +39,7 @@ languages: fallbackType: strict fallbacks: '' flag: gb -errorHandling: - - - errorCode: '404' - errorHandler: Page - errorContentSource: 't3://page?uid=608' -routes: - - - route: robots.txt - type: staticText - content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" +rootPageId: 884 routeEnhancers: NewsPlugin: type: Extbase @@ -117,10 +116,15 @@ routeEnhancers: routeFieldName: uid PageTypeSuffix: type: PageType - default: '/' + default: / index: '' map: - '/': 0 - '/json': 1703 - 'sitemap.xml': 1533906435 - 'yoast-snippetpreview.json': 1480321830 + /: 0 + /json: 1703 + sitemap.xml: 1533906435 + yoast-snippetpreview.json: 1480321830 +routes: + - + route: robots.txt + type: staticText + content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" diff --git a/config/sites/ep-reisen/config.yaml b/config/sites/ep-reisen/config.yaml index 6d2ff1b1..8fbc375c 100644 --- a/config/sites/ep-reisen/config.yaml +++ b/config/sites/ep-reisen/config.yaml @@ -7,7 +7,7 @@ baseVariants: base: 'https://schnee-event.burn.dpn' condition: 'applicationContext == "Development/Skimax"' - - base: 'https://ep-reisen-web.ddev.site' + base: 'https://ep-reisen.ddev.site' condition: 'applicationContext == "Development/Ddev"' disableStaticFileCache: true errorHandling: diff --git a/config/sites/ski-boarderweek/config.yaml b/config/sites/ski-boarderweek/config.yaml index fdb9adb7..6404fef8 100644 --- a/config/sites/ski-boarderweek/config.yaml +++ b/config/sites/ski-boarderweek/config.yaml @@ -1,9 +1,17 @@ -rootPageId: 24 base: 'https://www.ski-boarderweek.de' baseVariants: - base: 'https://ski-boarderweek.burn.dpn' condition: 'applicationContext == "Development"' + - + base: 'https://ski-boarderweek.ddev.site' + condition: 'applicationContext == "Development/Ddev"' +disableStaticFileCache: false +errorHandling: + - + errorCode: '404' + errorHandler: Page + errorContentSource: 't3://page?uid=608' languages: - title: Deutsch @@ -17,16 +25,7 @@ languages: hreflang: de-DE direction: '' flag: de -errorHandling: - - - errorCode: '404' - errorHandler: Page - errorContentSource: 't3://page?uid=608' -routes: - - - route: robots.txt - type: staticText - content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" +rootPageId: 24 routeEnhancers: TeamPlugin: type: Extbase @@ -48,11 +47,16 @@ routeEnhancers: routeFieldName: path_segment PageTypeSuffix: type: PageType - default: '/' + default: / index: '' map: - '/': 0 - '/json': 1701 - '/html': 1702 - 'sitemap.xml': 1533906435 - 'yoast-snippetpreview.json': 1480321830 + /: 0 + /json: 1701 + /html: 1702 + sitemap.xml: 1533906435 + yoast-snippetpreview.json: 1480321830 +routes: + - + route: robots.txt + type: staticText + content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" diff --git a/config/sites/ski-wochenenden/config.yaml b/config/sites/ski-wochenenden/config.yaml index f0ad45d4..d880dfab 100644 --- a/config/sites/ski-wochenenden/config.yaml +++ b/config/sites/ski-wochenenden/config.yaml @@ -1,9 +1,17 @@ -rootPageId: 14 base: 'https://www.ski-wochenenden.de' baseVariants: - base: 'https://ski-wochenenden.burn.dpn' condition: 'applicationContext == "Development"' + - + base: 'https://ski-wochenenden.ddev.site' + condition: 'applicationContext == "Development/Ddev"' +disableStaticFileCache: false +errorHandling: + - + errorCode: '404' + errorHandler: Page + errorContentSource: 't3://page?uid=608' languages: - title: Deutsch @@ -17,16 +25,7 @@ languages: hreflang: de-DE direction: '' flag: de -errorHandling: - - - errorCode: '404' - errorHandler: Page - errorContentSource: 't3://page?uid=608' -routes: - - - route: robots.txt - type: staticText - content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" +rootPageId: 14 routeEnhancers: StaticResultsPlugin: type: Extbase @@ -45,11 +44,16 @@ routeEnhancers: filter_settings: '[A-Z\d%\-]+' PageTypeSuffix: type: PageType - default: '/' + default: / index: '' map: - '/': 0 - '/json': 1701 - '/html': 1702 - 'sitemap.xml': 1533906435 - 'yoast-snippetpreview.json': 1480321830 + /: 0 + /json: 1701 + /html: 1702 + sitemap.xml: 1533906435 + yoast-snippetpreview.json: 1480321830 +routes: + - + route: robots.txt + type: staticText + content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" diff --git a/config/sites/snowzone/config.yaml b/config/sites/snowzone/config.yaml index 5ec3d0dd..49ff557c 100644 --- a/config/sites/snowzone/config.yaml +++ b/config/sites/snowzone/config.yaml @@ -1,9 +1,17 @@ -rootPageId: 25 base: 'https://www.snowzone.net' baseVariants: - base: 'https://snowzone.burn.dpn' condition: 'applicationContext == "Development"' + - + base: 'https://snowzone.ddev.site' + condition: 'applicationContext == "Development/Ddev"' +disableStaticFileCache: false +errorHandling: + - + errorCode: '404' + errorHandler: Page + errorContentSource: 't3://page?uid=608' languages: - title: Deutsch @@ -17,16 +25,7 @@ languages: hreflang: de-DE direction: '' flag: de -errorHandling: - - - errorCode: '404' - errorHandler: Page - errorContentSource: 't3://page?uid=608' -routes: - - - route: robots.txt - type: staticText - content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" +rootPageId: 25 routeEnhancers: TeamPlugin: type: Extbase @@ -48,11 +47,16 @@ routeEnhancers: routeFieldName: path_segment PageTypeSuffix: type: PageType - default: '/' + default: / index: '' map: - '/': 0 - '/json': 1701 - '/html': 1702 - 'sitemap.xml': 1533906435 - 'yoast-snippetpreview.json': 1480321830 + /: 0 + /json: 1701 + /html: 1702 + sitemap.xml: 1533906435 + yoast-snippetpreview.json: 1480321830 +routes: + - + route: robots.txt + type: staticText + content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" diff --git a/config/sites/unichamp/config.yaml b/config/sites/unichamp/config.yaml index cad09326..8f5e4ff1 100644 --- a/config/sites/unichamp/config.yaml +++ b/config/sites/unichamp/config.yaml @@ -1,9 +1,17 @@ -rootPageId: 26 base: 'https://www.unichamp.de' baseVariants: - base: 'https://unichamp.burn.dpn' condition: 'applicationContext == "Development"' + - + base: 'https://unichamp.ddev.site' + condition: 'applicationContext == "Development/Ddev"' +disableStaticFileCache: false +errorHandling: + - + errorCode: '404' + errorHandler: Page + errorContentSource: 't3://page?uid=608' languages: - title: Deutsch @@ -17,16 +25,7 @@ languages: hreflang: de-DE direction: '' flag: de -errorHandling: - - - errorCode: '404' - errorHandler: Page - errorContentSource: 't3://page?uid=608' -routes: - - - route: robots.txt - type: staticText - content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" +rootPageId: 26 routeEnhancers: TeamPlugin: type: Extbase @@ -48,11 +47,16 @@ routeEnhancers: routeFieldName: path_segment PageTypeSuffix: type: PageType - default: '/' + default: / index: '' map: - '/': 0 - '/json': 1701 - '/html': 1702 - 'sitemap.xml': 1533906435 - 'yoast-snippetpreview.json': 1480321830 + /: 0 + /json: 1701 + /html: 1702 + sitemap.xml: 1533906435 + yoast-snippetpreview.json: 1480321830 +routes: + - + route: robots.txt + type: staticText + content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" diff --git a/public/.htaccess b/public/.htaccess index c78f5b06..77d91490 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -1,5 +1,3 @@ -#SetEnv TYPO3_CONTEXT "Development" - ### Begin: Compression ### # Compressing resource files will save bandwidth and so improve loading speed especially for users @@ -238,8 +236,9 @@ AddDefaultCharset utf-8 # Enable URL rewriting RewriteEngine On - # Force SSL for all domains + # Force SSL for all domains except ddev RewriteCond %{HTTPS} off + RewriteCond %{HTTP_HOST} !\.ddev\.site$ RewriteRule (.*) https://%{HTTP_HOST}/$1 [R=301,L] # Store the current location in an environment variable CWD to use @@ -252,20 +251,6 @@ AddDefaultCharset utf-8 #RewriteRule .? - [E=TYPO3_CONTEXT:Development] #RewriteCond %{HTTP_HOST} ^staging\.example\.com$ #RewriteRule .? - [E=TYPO3_CONTEXT:Production/Staging] - RewriteCond %{HTTP_HOST} ^eptypo3\.burn\.dpn$ - RewriteRule .? - [E=TYPO3_CONTEXT:Development] - RewriteCond %{HTTP_HOST} ^ep\-events\.burn\.dpn$ - RewriteRule .? - [E=TYPO3_CONTEXT:Development] - RewriteCond %{HTTP_HOST} ^ski\-wochenenden\.burn\.dpn$ - RewriteRule .? - [E=TYPO3_CONTEXT:Development] - RewriteCond %{HTTP_HOST} ^ski\-boarderweek\.burn\.dpn$ - RewriteRule .? - [E=TYPO3_CONTEXT:Development] - RewriteCond %{HTTP_HOST} ^snowzone\.burn\.dpn$ - RewriteRule .? - [E=TYPO3_CONTEXT:Development] - RewriteCond %{HTTP_HOST} ^unichamp\.burn\.dpn$ - RewriteRule .? - [E=TYPO3_CONTEXT:Development] - RewriteCond %{HTTP_HOST} ^schnee\-event\.burn\.dpn$ - RewriteRule .? - [E=TYPO3_CONTEXT:Development/Skimax] # Rule for versioned static files, configured through: # - $GLOBALS['TYPO3_CONF_VARS']['BE']['versionNumberInFilename'] From 060a0b0764b662a323b5071e03f9b65a0aad103d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Sat, 25 Jan 2020 11:28:50 +0100 Subject: [PATCH 5/6] Refine ddev config and htaccess once more, update .gitignore --- .ddev/.dbimageBuild/Dockerfile | 9 - .ddev/.gitignore | 24 +++ .ddev/.sshimageBuild/Dockerfile | 9 - .ddev/.webimageBuild/Dockerfile | 9 - .ddev/commands/db/README.txt | 16 -- .ddev/commands/db/mysql | 9 - .ddev/commands/db/mysqldump.example | 8 - .ddev/commands/host/README.txt | 18 -- .ddev/commands/host/launch | 28 ---- .ddev/commands/host/mysqlworkbench.example | 32 ---- .ddev/commands/host/phpstorm.example | 9 - .ddev/commands/host/solrtail.example | 11 -- .ddev/commands/solr/README.txt | 24 --- .ddev/commands/solr/solrtail.example | 13 -- .ddev/commands/web/README.txt | 20 --- .ddev/commands/web/drush.example | 8 - .ddev/commands/web/reload-nginx.example | 8 - .ddev/config.yaml | 12 +- .ddev/docker-compose.yaml | 182 --------------------- public/.htaccess | 4 +- 20 files changed, 32 insertions(+), 421 deletions(-) delete mode 100644 .ddev/.dbimageBuild/Dockerfile create mode 100644 .ddev/.gitignore delete mode 100644 .ddev/.sshimageBuild/Dockerfile delete mode 100644 .ddev/.webimageBuild/Dockerfile delete mode 100755 .ddev/commands/db/README.txt delete mode 100755 .ddev/commands/db/mysql delete mode 100755 .ddev/commands/db/mysqldump.example delete mode 100755 .ddev/commands/host/README.txt delete mode 100755 .ddev/commands/host/launch delete mode 100755 .ddev/commands/host/mysqlworkbench.example delete mode 100755 .ddev/commands/host/phpstorm.example delete mode 100755 .ddev/commands/host/solrtail.example delete mode 100755 .ddev/commands/solr/README.txt delete mode 100755 .ddev/commands/solr/solrtail.example delete mode 100755 .ddev/commands/web/README.txt delete mode 100755 .ddev/commands/web/drush.example delete mode 100755 .ddev/commands/web/reload-nginx.example delete mode 100644 .ddev/docker-compose.yaml diff --git a/.ddev/.dbimageBuild/Dockerfile b/.ddev/.dbimageBuild/Dockerfile deleted file mode 100644 index a5f1b48d..00000000 --- a/.ddev/.dbimageBuild/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ - -ARG BASE_IMAGE -FROM $BASE_IMAGE - -ARG username -ARG uid -ARG gid -RUN (groupadd --gid $gid "$username" || groupadd "$username" || true) && (useradd -l -m -s "/bin/bash" --gid "$username" --comment '' --uid $uid "$username" || useradd -l -m -s "/bin/bash" --gid "$username" --comment '' "$username") - \ No newline at end of file diff --git a/.ddev/.gitignore b/.ddev/.gitignore new file mode 100644 index 00000000..e47970d8 --- /dev/null +++ b/.ddev/.gitignore @@ -0,0 +1,24 @@ +#ddev-generated: Automatically generated ddev .gitignore. +# You can remove the above line if you want to edit and maintain this file yourself. + +/commands/*/*.example +/commands/*/README.txt +/commands/host/launch +/commands/db/mysql +/homeadditions/*.example +/homeadditions/README.txt +/.gitignore +/import.yaml +/docker-compose.yaml +/db_snapshots +/sequelpro.spf +/import-db +/.bgsync* +/config.*.y*ml +/.webimageBuild +/.dbimageBuild +/.bgsyncimageBuild +/.sshimageBuild +/.webimageExtra +/.dbimageExtra +/*-build/Dockerfile.example diff --git a/.ddev/.sshimageBuild/Dockerfile b/.ddev/.sshimageBuild/Dockerfile deleted file mode 100644 index a5f1b48d..00000000 --- a/.ddev/.sshimageBuild/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ - -ARG BASE_IMAGE -FROM $BASE_IMAGE - -ARG username -ARG uid -ARG gid -RUN (groupadd --gid $gid "$username" || groupadd "$username" || true) && (useradd -l -m -s "/bin/bash" --gid "$username" --comment '' --uid $uid "$username" || useradd -l -m -s "/bin/bash" --gid "$username" --comment '' "$username") - \ No newline at end of file diff --git a/.ddev/.webimageBuild/Dockerfile b/.ddev/.webimageBuild/Dockerfile deleted file mode 100644 index a5f1b48d..00000000 --- a/.ddev/.webimageBuild/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ - -ARG BASE_IMAGE -FROM $BASE_IMAGE - -ARG username -ARG uid -ARG gid -RUN (groupadd --gid $gid "$username" || groupadd "$username" || true) && (useradd -l -m -s "/bin/bash" --gid "$username" --comment '' --uid $uid "$username" || useradd -l -m -s "/bin/bash" --gid "$username" --comment '' "$username") - \ No newline at end of file diff --git a/.ddev/commands/db/README.txt b/.ddev/commands/db/README.txt deleted file mode 100755 index 97e4fd6b..00000000 --- a/.ddev/commands/db/README.txt +++ /dev/null @@ -1,16 +0,0 @@ -Scripts in this directory will be executed inside the db -container. A number of environment variables are supplied to the scripts, including: - -DDEV_APPROOT: file system location of the project on the host) -DDEV_HOST_DB_PORT: Localhost port of the database server -DDEV_HOST_WEBSERVER_PORT: Localhost port of the webserver -DDEV_HOST_HTTPS_PORT: Localhost port for https on webserver -DDEV_DOCROOT: Relative path from approot to docroot -DDEV_HOSTNAME: Comma-separated list of FQDN hostnames -DDEV_PHP_VERSION -DDEV_WEBSERVER_TYPE: nginx-fpm, apache-fpm, apache-cgi -DDEV_PROJECT_TYPE: drupal8, typo3, backdrop, wordpress, etc. -DDEV_ROUTER_HTTP_PORT: Router port for http -DDEV_ROUTER_HTTPS_PORT: Router port for https - -More environment variables may be available, see https://github.com/drud/ddev/blob/52c7915dee41d4846f9f619520b726994c0372c5/pkg/ddevapp/ddevapp.go#L1006-L1030 diff --git a/.ddev/commands/db/mysql b/.ddev/commands/db/mysql deleted file mode 100755 index 23a06dbd..00000000 --- a/.ddev/commands/db/mysql +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -## #ddev-generated -## Description: run mysql client in db container -## Usage: mysql [flags] [args] -## Example: "ddev mysql" or "ddev mysql -uroot -proot" or "echo 'SHOW TABLES;' | ddev mysql" -## `ddev mysql --database=mysql -uroot -proot` gets you to the 'mysql' database with root privileges - -mysql -udb -pdb $@ diff --git a/.ddev/commands/db/mysqldump.example b/.ddev/commands/db/mysqldump.example deleted file mode 100755 index 63fd1d49..00000000 --- a/.ddev/commands/db/mysqldump.example +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -## #ddev-generated -## Description: run mysqldump in web container -## Usage: mysqldump [flags] [args] -## Example: "ddev mysqldump db" or "ddev mysqldump otherdb" or "ddev mysqldump db | gzip >db.sql.gz" - -mysqldump -uroot -proot $@ diff --git a/.ddev/commands/host/README.txt b/.ddev/commands/host/README.txt deleted file mode 100755 index 773f9803..00000000 --- a/.ddev/commands/host/README.txt +++ /dev/null @@ -1,18 +0,0 @@ -Scripts in this directory will be executed on the host -but they can take easily take action on containers by using -`ddev exec`. A number of environment variables are supplied to the scripts -including: - -DDEV_APPROOT: file system location of the project on the host) -DDEV_HOST_DB_PORT: Localhost port of the database server -DDEV_HOST_WEBSERVER_PORT: Localhost port of the webserver -DDEV_HOST_HTTPS_PORT: Localhost port for https on webserver -DDEV_DOCROOT: Relative path from approot to docroot -DDEV_HOSTNAME: Comma-separated list of FQDN hostnames -DDEV_PHP_VERSION -DDEV_WEBSERVER_TYPE: nginx-fpm, apache-fpm, apache-cgi -DDEV_PROJECT_TYPE: drupal8, typo3, backdrop, wordpress, etc. -DDEV_ROUTER_HTTP_PORT: Router port for http -DDEV_ROUTER_HTTPS_PORT: Router port for https - -More environment variables may be available, see https://github.com/drud/ddev/blob/52c7915dee41d4846f9f619520b726994c0372c5/pkg/ddevapp/ddevapp.go#L1006-L1030 diff --git a/.ddev/commands/host/launch b/.ddev/commands/host/launch deleted file mode 100755 index 37db084b..00000000 --- a/.ddev/commands/host/launch +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -## #ddev-generated -## Description: Launch a browser with the current site -## Usage: launch [path] -## Example: "ddev launch" or "ddev launch /admin/reports/status/php" or "ddev launch phpinfo.php" - -FULLURL=${DDEV_PRIMARY_URL} - -if [ -n "${1:-}" ] ; then - if [[ ${1::1} != "/" ]] ; then - FULLURL="${FULLURL}/"; - fi - - FULLURL="${FULLURL}${1}"; -fi - -case $OSTYPE in - linux-gnu) - xdg-open ${FULLURL} - ;; - "darwin"*) - open ${FULLURL} - ;; - "win*"* | "msys"*) - start ${FULLURL} - ;; -esac diff --git a/.ddev/commands/host/mysqlworkbench.example b/.ddev/commands/host/mysqlworkbench.example deleted file mode 100755 index a4e349ae..00000000 --- a/.ddev/commands/host/mysqlworkbench.example +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -## #ddev-generated -## Description: Run MySQLWorkbench against current db -## Usage: mysqlworkbench -## Example: "ddev mysqlworkbench" - -# Note that this examle uses $DDEV_HOST_DB_PORT to get the port for the connection -# Mysql Workbench can be obtained from https://dev.mysql.com/downloads/workbench/ - -query="root:root@127.0.0.1:${DDEV_HOST_DB_PORT}" - -case $OSTYPE in - linux-gnu) - # You may need "apt-get install libproj-dev gnome-keyring" if it complains about those - mysql-workbench --query "$query" & - echo "Attempted to launch mysql-workbench" - ;; - - "darwin"*) - "/Applications/MySQLWorkbench.app/Contents/MacOS/MySQLWorkbench" --query "$query" & - echo "Attempted to launch MySQLWorkbench.app" - ;; - - "win*"* | "msys"*) - # 'C:\Program Files\MySQL\MySQL Workbench 8.0 CE\mysqlworkbench.exe' - # You may need to add it to your system %PATH% or change the path here - # On docker toolbox you'll need to change the query to use the toolbox IP address, - # likely 192.168.99.100 - 'C:\Program Files\MySQL\MySQL Workbench 8.0 CE\mysqlworkbench.exe' --query "$query" - #;; -esac diff --git a/.ddev/commands/host/phpstorm.example b/.ddev/commands/host/phpstorm.example deleted file mode 100755 index 45725376..00000000 --- a/.ddev/commands/host/phpstorm.example +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -## #ddev-generated -## Description: Open PHPStorm with the current project -## Usage: phpstorm -## Example: "ddev phpstorm" - -# Example is macOS-specific, but easy to adapt to any OS -open -a PHPStorm.app ${DDEV_APPROOT} diff --git a/.ddev/commands/host/solrtail.example b/.ddev/commands/host/solrtail.example deleted file mode 100755 index 2abee14e..00000000 --- a/.ddev/commands/host/solrtail.example +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -## #ddev-generated -## Description: Tail the main solr log -## Usage: solrtail -## Example: ddev solrtail - -# This can't work unless you have a solr service, -# See https://ddev.readthedocs.io/en/stable/users/extend/additional-services/#apache-solr - -ddev exec -s solr tail -40lf /opt/solr/server/logs/solr.log diff --git a/.ddev/commands/solr/README.txt b/.ddev/commands/solr/README.txt deleted file mode 100755 index da5bb83f..00000000 --- a/.ddev/commands/solr/README.txt +++ /dev/null @@ -1,24 +0,0 @@ -Scripts in this directory will be executed inside the solr -container (if it exists, of course). This is just an example, -but any named service can have a directory with commands. - -Note that /mnt/ddev_config must be mounted into the 3rd-party service -with a stanza like this in the docker-compose.solr.yaml: - - volumes: - - type: "bind" - source: "." - target: "/mnt/ddev_config" - - -A number of environment variables are supplied to the scripts, including: - -DDEV_DOCROOT: Relative path from approot to docroot -DDEV_HOSTNAME: Comma-separated list of FQDN hostnames -DDEV_PHP_VERSION -DDEV_WEBSERVER_TYPE: nginx-fpm, apache-fpm, apache-cgi -DDEV_PROJECT_TYPE: drupal8, typo3, backdrop, wordpress, etc. -DDEV_ROUTER_HTTP_PORT: Router port for http -DDEV_ROUTER_HTTPS_PORT: Router port for https - -More environment variables may be available, see https://github.com/drud/ddev/blob/52c7915dee41d4846f9f619520b726994c0372c5/pkg/ddevapp/ddevapp.go#L1006-L1030 diff --git a/.ddev/commands/solr/solrtail.example b/.ddev/commands/solr/solrtail.example deleted file mode 100755 index 309a07a7..00000000 --- a/.ddev/commands/solr/solrtail.example +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -## #ddev-generated -## Description: Tail the main solr log -## Usage: solrtail -## Example: ddev solrtail - -# This example runs inside the solr container. -# Note that this requires that /mnt/ddev_config be mounted -# into the solr container and of course that you have a container -# named solr. - -tail -f /opt/solr/server/logs/solr.log diff --git a/.ddev/commands/web/README.txt b/.ddev/commands/web/README.txt deleted file mode 100755 index 9847dc1f..00000000 --- a/.ddev/commands/web/README.txt +++ /dev/null @@ -1,20 +0,0 @@ -Scripts in this directory will be executed inside the web -container. You can copy the example file or just rename it: -`mv drush.example drush`, for example, and it will become -a live command. - -A number of environment variables are supplied to the scripts, including: - -DDEV_APPROOT: file system location of the project on the host) -DDEV_HOST_DB_PORT: Localhost port of the database server -DDEV_HOST_WEBSERVER_PORT: Localhost port of the webserver -DDEV_HOST_HTTPS_PORT: Localhost port for https on webserver -DDEV_DOCROOT: Relative path from approot to docroot -DDEV_HOSTNAME: Comma-separated list of FQDN hostnames -DDEV_PHP_VERSION -DDEV_WEBSERVER_TYPE: nginx-fpm, apache-fpm, apache-cgi -DDEV_PROJECT_TYPE: drupal8, typo3, backdrop, wordpress, etc. -DDEV_ROUTER_HTTP_PORT: Router port for http -DDEV_ROUTER_HTTPS_PORT: Router port for https - -More environment variables may be available, see https://github.com/drud/ddev/blob/52c7915dee41d4846f9f619520b726994c0372c5/pkg/ddevapp/ddevapp.go#L1006-L1030 diff --git a/.ddev/commands/web/drush.example b/.ddev/commands/web/drush.example deleted file mode 100755 index 3c65a0f7..00000000 --- a/.ddev/commands/web/drush.example +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -## #ddev-generated -## Description: Run drush inside the web container -## Usage: drush [flags] [args] -## Example: "ddev drush uli" or "ddev drush sql-cli" or "ddev drush --version" - -drush $@ diff --git a/.ddev/commands/web/reload-nginx.example b/.ddev/commands/web/reload-nginx.example deleted file mode 100755 index f70cc97e..00000000 --- a/.ddev/commands/web/reload-nginx.example +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -## #ddev-generated -## Description: Reload config for nginx and php-fpm inside web container -## Usage: restart-nginx -## Example: "ddev restart-nginx" - -killall -HUP nginx php-fpm diff --git a/.ddev/config.yaml b/.ddev/config.yaml index d098edb9..4830946c 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -8,12 +8,12 @@ router_http_port: "80" router_https_port: "443" xdebug_enabled: false additional_hostnames: - - ep-events - - ski-boarderweek - - snowzone - - unichamp - - ski-wochenenden - - schnee-event +- ep-events +- ski-boarderweek +- snowzone +- unichamp +- ski-wochenenden +- schnee-event additional_fqdns: [] nfs_mount_enabled: true provider: default diff --git a/.ddev/docker-compose.yaml b/.ddev/docker-compose.yaml deleted file mode 100644 index b2ce8757..00000000 --- a/.ddev/docker-compose.yaml +++ /dev/null @@ -1,182 +0,0 @@ -version: '3.6' -#ddev-generated -services: - - db: - container_name: ddev-${DDEV_SITENAME}-db - build: - context: '/Users/fromme/www/ep-reisen/.ddev/.dbimageBuild' - args: - BASE_IMAGE: $DDEV_DBIMAGE - username: 'fromme' - uid: '501' - gid: '20' - image: ${DDEV_DBIMAGE}-built - stop_grace_period: 60s - volumes: - - type: "volume" - source: mariadb-database - target: "/var/lib/mysql" - volume: - nocopy: true - - type: "bind" - source: "." - target: "/mnt/ddev_config" - - ddev-global-cache:/mnt/ddev-global-cache - restart: "no" - user: "$DDEV_UID:$DDEV_GID" - hostname: ep-reisen-db - ports: - - "127.0.0.1:$DDEV_HOST_DB_PORT:3306" - labels: - com.ddev.site-name: ${DDEV_SITENAME} - com.ddev.platform: ddev - com.ddev.app-type: typo3 - com.ddev.approot: $DDEV_APPROOT - environment: - - COLUMNS=$COLUMNS - - LINES=$LINES - - TZ=Europe/Berlin - - DDEV_PROJECT=ep-reisen - command: "$DDEV_MARIADB_LOCAL_COMMAND" - healthcheck: - interval: 1s - retries: 30 - start_period: 20s - timeout: 120s - - web: - container_name: ddev-${DDEV_SITENAME}-web - build: - context: '/Users/fromme/www/ep-reisen/.ddev/.webimageBuild' - args: - BASE_IMAGE: $DDEV_WEBIMAGE - username: 'fromme' - uid: '501' - gid: '20' - image: ${DDEV_WEBIMAGE}-built - cap_add: - - SYS_PTRACE - volumes: - - type: volume - source: nfsmount - target: /var/www/html - - volume: - nocopy: true - - - ".:/mnt/ddev_config:ro" - - ddev-global-cache:/mnt/ddev-global-cache - - - ddev-ssh-agent_socket_dir:/home/.ssh-agent - - - restart: "no" - user: "$DDEV_UID:$DDEV_GID" - hostname: ep-reisen-web - - links: - - db:db - - # ports is list of exposed *container* ports - ports: - - "127.0.0.1:$DDEV_HOST_WEBSERVER_PORT:80" - - "127.0.0.1:$DDEV_HOST_HTTPS_PORT:443" - environment: - - DOCROOT=$DDEV_DOCROOT - - DDEV_PHP_VERSION=$DDEV_PHP_VERSION - - DDEV_WEBSERVER_TYPE=$DDEV_WEBSERVER_TYPE - - DDEV_PROJECT_TYPE=$DDEV_PROJECT_TYPE - - DDEV_ROUTER_HTTP_PORT=$DDEV_ROUTER_HTTP_PORT - - DDEV_ROUTER_HTTPS_PORT=$DDEV_ROUTER_HTTPS_PORT - - DDEV_XDEBUG_ENABLED=$DDEV_XDEBUG_ENABLED - - DOCKER_IP=127.0.0.1 - - HOST_DOCKER_INTERNAL_IP= - - DEPLOY_NAME=local - - VIRTUAL_HOST=$DDEV_HOSTNAME - - COLUMNS=$COLUMNS - - LINES=$LINES - - TZ=Europe/Berlin - # HTTP_EXPOSE allows for ports accepting HTTP traffic to be accessible from .ddev.site: - # To expose a container port to a different host port, define the port as hostPort:containerPort - - HTTP_EXPOSE=${DDEV_ROUTER_HTTP_PORT}:80,${DDEV_MAILHOG_PORT}:8025 - # You can optionally expose an HTTPS port option for any ports defined in HTTP_EXPOSE. - # To expose an HTTPS port, define the port as securePort:containerPort. - - HTTPS_EXPOSE=${DDEV_ROUTER_HTTPS_PORT}:80 - - SSH_AUTH_SOCK=/home/.ssh-agent/socket - - DDEV_PROJECT=ep-reisen - labels: - com.ddev.site-name: ${DDEV_SITENAME} - com.ddev.platform: ddev - com.ddev.app-type: typo3 - com.ddev.approot: $DDEV_APPROOT - - external_links: - - "ddev-router:ep-events.ddev.site" - - "ddev-router:ep-reisen.ddev.site" - - "ddev-router:schnee-event.ddev.site" - - "ddev-router:ski-boarderweek.ddev.site" - - "ddev-router:ski-wochenenden.ddev.site" - - "ddev-router:snowzone.ddev.site" - - "ddev-router:unichamp.ddev.site" - - healthcheck: - interval: 1s - retries: 10 - start_period: 10s - timeout: 120s - - - - dba: - container_name: ddev-${DDEV_SITENAME}-dba - image: $DDEV_DBAIMAGE - restart: "no" - labels: - com.ddev.site-name: ${DDEV_SITENAME} - com.ddev.platform: ddev - com.ddev.app-type: typo3 - com.ddev.approot: $DDEV_APPROOT - links: - - db:db - ports: - - "80" - hostname: ep-reisen-dba - environment: - - PMA_USER=db - - PMA_PASSWORD=db - - VIRTUAL_HOST=$DDEV_HOSTNAME - - TZ=Europe/Berlin - # HTTP_EXPOSE allows for ports accepting HTTP traffic to be accessible from .ddev.site: - - HTTP_EXPOSE=${DDEV_PHPMYADMIN_PORT}:8036 - healthcheck: - interval: 120s - timeout: 2s - retries: 1 - -networks: - default: - external: - name: ddev_default -volumes: - - mariadb-database: - name: "${DDEV_SITENAME}-mariadb" - - - ddev-ssh-agent_socket_dir: - external: true - - ddev-global-cache: - name: ddev-global-cache - - - nfsmount: - driver: local - driver_opts: - type: nfs - o: "addr=host.docker.internal,hard,nolock,rw" - device: ":/Users/fromme/www/ep-reisen" - - - \ No newline at end of file diff --git a/public/.htaccess b/public/.htaccess index 77d91490..e4c320b9 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -236,9 +236,9 @@ AddDefaultCharset utf-8 # Enable URL rewriting RewriteEngine On - # Force SSL for all domains except ddev + # Force SSL RewriteCond %{HTTPS} off - RewriteCond %{HTTP_HOST} !\.ddev\.site$ + RewriteCond %{HTTP:X-Forwarded-Proto} =http RewriteRule (.*) https://%{HTTP_HOST}/$1 [R=301,L] # Store the current location in an environment variable CWD to use From 7579a18da98101f4568377e1aff1ec9919105b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Sat, 25 Jan 2020 11:41:18 +0100 Subject: [PATCH 6/6] Update project dependencies --- composer.lock | 164 ++++++++++++++++++++++++-------------------------- 1 file changed, 80 insertions(+), 84 deletions(-) diff --git a/composer.lock b/composer.lock index d8d11eca..5d54c951 100644 --- a/composer.lock +++ b/composer.lock @@ -842,16 +842,16 @@ }, { "name": "gridelementsteam/gridelements", - "version": "9.3.0", + "version": "9.4.1", "source": { "type": "git", "url": "https://gitlab.com/coderscare/gridelements.git", - "reference": "06a7f541a30d985f7466d2b976eb0336848cff6e" + "reference": "18bc9653bfe4a59dd848fe4e45d7a68c6fd5409f" }, "dist": { "type": "zip", - "url": "https://gitlab.com/api/v4/projects/coderscare%2Fgridelements/repository/archive.zip?sha=06a7f541a30d985f7466d2b976eb0336848cff6e", - "reference": "06a7f541a30d985f7466d2b976eb0336848cff6e", + "url": "https://gitlab.com/api/v4/projects/coderscare%2Fgridelements/repository/archive.zip?sha=18bc9653bfe4a59dd848fe4e45d7a68c6fd5409f", + "reference": "18bc9653bfe4a59dd848fe4e45d7a68c6fd5409f", "shasum": "" }, "require": { @@ -860,12 +860,8 @@ "typo3/cms-frontend": "^9.5.7", "typo3/cms-recordlist": "^9.5.7" }, - "conflict": { - "jfmulticontent": "*", - "templavoila": "*" - }, "replace": { - "gridelements": "self.version", + "gridelementsteam/gridelements": "self.version", "typo3-ter/gridelements": "self.version" }, "type": "typo3-cms-extension", @@ -885,7 +881,7 @@ "TYPO3 CMS", "grids" ], - "time": "2019-08-15T16:41:24+00:00" + "time": "2020-01-17T16:30:24+00:00" }, { "name": "guzzlehttp/guzzle", @@ -1267,16 +1263,16 @@ }, { "name": "kigkonsult/icalcreator", - "version": "v2.29.14", + "version": "v2.29.15", "source": { "type": "git", "url": "https://github.com/iCalcreator/iCalcreator.git", - "reference": "af69b2c08a871d65d64c486b4b3c1a4ca8ebfa35" + "reference": "f66748df0858f5a9fecbecee41b81a3a63f12f4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/iCalcreator/iCalcreator/zipball/af69b2c08a871d65d64c486b4b3c1a4ca8ebfa35", - "reference": "af69b2c08a871d65d64c486b4b3c1a4ca8ebfa35", + "url": "https://api.github.com/repos/iCalcreator/iCalcreator/zipball/f66748df0858f5a9fecbecee41b81a3a63f12f4e", + "reference": "f66748df0858f5a9fecbecee41b81a3a63f12f4e", "shasum": "" }, "require": { @@ -2052,16 +2048,16 @@ }, { "name": "symfony/cache", - "version": "v5.0.2", + "version": "v5.0.3", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "6e8d978878ae5de705ec9fabbb6011cc18776bc9" + "reference": "b503e72c8e2fa55eed9e2d3dd6a166f3eaaabb9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/6e8d978878ae5de705ec9fabbb6011cc18776bc9", - "reference": "6e8d978878ae5de705ec9fabbb6011cc18776bc9", + "url": "https://api.github.com/repos/symfony/cache/zipball/b503e72c8e2fa55eed9e2d3dd6a166f3eaaabb9a", + "reference": "b503e72c8e2fa55eed9e2d3dd6a166f3eaaabb9a", "shasum": "" }, "require": { @@ -2127,7 +2123,7 @@ "caching", "psr6" ], - "time": "2019-12-12T13:03:32+00:00" + "time": "2020-01-10T21:57:37+00:00" }, { "name": "symfony/cache-contracts", @@ -2189,16 +2185,16 @@ }, { "name": "symfony/console", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "82437719dab1e6bdd28726af14cb345c2ec816d0" + "reference": "e9ee09d087e2c88eaf6e5fc0f5c574f64d100e4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/82437719dab1e6bdd28726af14cb345c2ec816d0", - "reference": "82437719dab1e6bdd28726af14cb345c2ec816d0", + "url": "https://api.github.com/repos/symfony/console/zipball/e9ee09d087e2c88eaf6e5fc0f5c574f64d100e4f", + "reference": "e9ee09d087e2c88eaf6e5fc0f5c574f64d100e4f", "shasum": "" }, "require": { @@ -2261,20 +2257,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-12-17T10:32:23+00:00" + "time": "2020-01-10T21:54:01+00:00" }, { "name": "symfony/expression-language", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/expression-language.git", - "reference": "539e7ff0b635c8b90d8127bc929da781a96eab2d" + "reference": "8b145496d7e2e7103b1a1b8f1fce81c6e084b380" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/expression-language/zipball/539e7ff0b635c8b90d8127bc929da781a96eab2d", - "reference": "539e7ff0b635c8b90d8127bc929da781a96eab2d", + "url": "https://api.github.com/repos/symfony/expression-language/zipball/8b145496d7e2e7103b1a1b8f1fce81c6e084b380", + "reference": "8b145496d7e2e7103b1a1b8f1fce81c6e084b380", "shasum": "" }, "require": { @@ -2312,20 +2308,20 @@ ], "description": "Symfony ExpressionLanguage Component", "homepage": "https://symfony.com", - "time": "2019-12-10T10:33:21+00:00" + "time": "2020-01-04T13:00:46+00:00" }, { "name": "symfony/finder", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ce8743441da64c41e2a667b8eb66070444ed911e" + "reference": "3a50be43515590faf812fbd7708200aabc327ec3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ce8743441da64c41e2a667b8eb66070444ed911e", - "reference": "ce8743441da64c41e2a667b8eb66070444ed911e", + "url": "https://api.github.com/repos/symfony/finder/zipball/3a50be43515590faf812fbd7708200aabc327ec3", + "reference": "3a50be43515590faf812fbd7708200aabc327ec3", "shasum": "" }, "require": { @@ -2361,20 +2357,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-11-17T21:56:56+00:00" + "time": "2020-01-04T13:00:46+00:00" }, { "name": "symfony/http-client", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "9ebfc77b5018a05226b38642def82746f3e2ce0f" + "reference": "a7f82a1590e2f146b9bb44c6323b21f091fb9e00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/9ebfc77b5018a05226b38642def82746f3e2ce0f", - "reference": "9ebfc77b5018a05226b38642def82746f3e2ce0f", + "url": "https://api.github.com/repos/symfony/http-client/zipball/a7f82a1590e2f146b9bb44c6323b21f091fb9e00", + "reference": "a7f82a1590e2f146b9bb44c6323b21f091fb9e00", "shasum": "" }, "require": { @@ -2429,7 +2425,7 @@ ], "description": "Symfony HttpClient component", "homepage": "https://symfony.com", - "time": "2019-12-19T15:57:49+00:00" + "time": "2020-01-21T07:39:36+00:00" }, { "name": "symfony/http-client-contracts", @@ -2490,16 +2486,16 @@ }, { "name": "symfony/inflector", - "version": "v5.0.2", + "version": "v5.0.3", "source": { "type": "git", "url": "https://github.com/symfony/inflector.git", - "reference": "aaeb5e293294070d1b061fa3d7889bac69909320" + "reference": "e375603b6bd12e8e3aec3fc1b640ac18a4ef4cb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/inflector/zipball/aaeb5e293294070d1b061fa3d7889bac69909320", - "reference": "aaeb5e293294070d1b061fa3d7889bac69909320", + "url": "https://api.github.com/repos/symfony/inflector/zipball/e375603b6bd12e8e3aec3fc1b640ac18a4ef4cb2", + "reference": "e375603b6bd12e8e3aec3fc1b640ac18a4ef4cb2", "shasum": "" }, "require": { @@ -2544,20 +2540,20 @@ "symfony", "words" ], - "time": "2019-11-18T17:27:11+00:00" + "time": "2020-01-04T14:08:26+00:00" }, { "name": "symfony/intl", - "version": "v5.0.2", + "version": "v5.0.3", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", - "reference": "41f910d47883c6ab37087ca4a3332e21e1d682f4" + "reference": "2b3694976f02ed6a7894d8a772c9d55cee5d9677" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/intl/zipball/41f910d47883c6ab37087ca4a3332e21e1d682f4", - "reference": "41f910d47883c6ab37087ca4a3332e21e1d682f4", + "url": "https://api.github.com/repos/symfony/intl/zipball/2b3694976f02ed6a7894d8a772c9d55cee5d9677", + "reference": "2b3694976f02ed6a7894d8a772c9d55cee5d9677", "shasum": "" }, "require": { @@ -2619,20 +2615,20 @@ "l10n", "localization" ], - "time": "2019-11-26T23:25:11+00:00" + "time": "2020-01-04T14:08:26+00:00" }, { "name": "symfony/options-resolver", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "2be23e63f33de16b49294ea6581f462932a77e2f" + "reference": "9a02d6662660fe7bfadad63b5f0b0718d4c8b6b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/2be23e63f33de16b49294ea6581f462932a77e2f", - "reference": "2be23e63f33de16b49294ea6581f462932a77e2f", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/9a02d6662660fe7bfadad63b5f0b0718d4c8b6b0", + "reference": "9a02d6662660fe7bfadad63b5f0b0718d4c8b6b0", "shasum": "" }, "require": { @@ -2673,7 +2669,7 @@ "configuration", "options" ], - "time": "2019-10-28T21:57:16+00:00" + "time": "2020-01-04T13:00:46+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3027,16 +3023,16 @@ }, { "name": "symfony/process", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "b84501ad50adb72a94fb460a5b5c91f693e99c9b" + "reference": "f5697ab4cb14a5deed7473819e63141bf5352c36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/b84501ad50adb72a94fb460a5b5c91f693e99c9b", - "reference": "b84501ad50adb72a94fb460a5b5c91f693e99c9b", + "url": "https://api.github.com/repos/symfony/process/zipball/f5697ab4cb14a5deed7473819e63141bf5352c36", + "reference": "f5697ab4cb14a5deed7473819e63141bf5352c36", "shasum": "" }, "require": { @@ -3072,20 +3068,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-12-06T10:06:46+00:00" + "time": "2020-01-09T09:50:08+00:00" }, { "name": "symfony/property-access", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "055fe3134f8f301ff44af314d83463b858ea6413" + "reference": "090b4bc92ded1ec512f7e2ed1691210769dffdb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/055fe3134f8f301ff44af314d83463b858ea6413", - "reference": "055fe3134f8f301ff44af314d83463b858ea6413", + "url": "https://api.github.com/repos/symfony/property-access/zipball/090b4bc92ded1ec512f7e2ed1691210769dffdb3", + "reference": "090b4bc92ded1ec512f7e2ed1691210769dffdb3", "shasum": "" }, "require": { @@ -3139,20 +3135,20 @@ "property path", "reflection" ], - "time": "2019-12-10T10:33:21+00:00" + "time": "2020-01-04T13:00:46+00:00" }, { "name": "symfony/routing", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "628bcafae1b2043969378dcfbf9c196539a38722" + "reference": "7bf4e38573728e317b926ca4482ad30470d0e86a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/628bcafae1b2043969378dcfbf9c196539a38722", - "reference": "628bcafae1b2043969378dcfbf9c196539a38722", + "url": "https://api.github.com/repos/symfony/routing/zipball/7bf4e38573728e317b926ca4482ad30470d0e86a", + "reference": "7bf4e38573728e317b926ca4482ad30470d0e86a", "shasum": "" }, "require": { @@ -3215,20 +3211,20 @@ "uri", "url" ], - "time": "2019-12-12T12:53:52+00:00" + "time": "2020-01-08T17:29:02+00:00" }, { "name": "symfony/serializer", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "e5bc3f6dee44dc06e7e640cce4baa741b73ecb6e" + "reference": "76ecc214a93b763c29b924277e85f64326f9fbb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/e5bc3f6dee44dc06e7e640cce4baa741b73ecb6e", - "reference": "e5bc3f6dee44dc06e7e640cce4baa741b73ecb6e", + "url": "https://api.github.com/repos/symfony/serializer/zipball/76ecc214a93b763c29b924277e85f64326f9fbb2", + "reference": "76ecc214a93b763c29b924277e85f64326f9fbb2", "shasum": "" }, "require": { @@ -3296,7 +3292,7 @@ ], "description": "Symfony Serializer Component", "homepage": "https://symfony.com", - "time": "2019-12-16T11:07:37+00:00" + "time": "2020-01-07T22:30:39+00:00" }, { "name": "symfony/service-contracts", @@ -3358,16 +3354,16 @@ }, { "name": "symfony/var-exporter", - "version": "v5.0.2", + "version": "v5.0.3", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "1b9653e68d5b701bf6d9c91bdd3660078c9f4f28" + "reference": "960f9ac0fdbd642461ed29d7717aeb2a94d428b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/1b9653e68d5b701bf6d9c91bdd3660078c9f4f28", - "reference": "1b9653e68d5b701bf6d9c91bdd3660078c9f4f28", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/960f9ac0fdbd642461ed29d7717aeb2a94d428b9", + "reference": "960f9ac0fdbd642461ed29d7717aeb2a94d428b9", "shasum": "" }, "require": { @@ -3414,20 +3410,20 @@ "instantiate", "serialize" ], - "time": "2019-12-01T08:48:26+00:00" + "time": "2020-01-04T14:08:26+00:00" }, { "name": "symfony/yaml", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "a08832b974dd5fafe3085a66d41fe4c84bb2628c" + "reference": "cd014e425b3668220adb865f53bff64b3ad21767" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/a08832b974dd5fafe3085a66d41fe4c84bb2628c", - "reference": "a08832b974dd5fafe3085a66d41fe4c84bb2628c", + "url": "https://api.github.com/repos/symfony/yaml/zipball/cd014e425b3668220adb865f53bff64b3ad21767", + "reference": "cd014e425b3668220adb865f53bff64b3ad21767", "shasum": "" }, "require": { @@ -3473,7 +3469,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-12-10T10:33:21+00:00" + "time": "2020-01-21T11:12:16+00:00" }, { "name": "typo3/class-alias-loader",