From b85e8082c36c30c3ba1dd07d940a7120059f494e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 18 Aug 2019 12:10:03 -0400 Subject: [PATCH] Commit local DDEV configuration --- .ddev/.gitignore | 19 +++ .ddev/commands/db/README.txt | 16 +++ .ddev/commands/db/mysql | 9 ++ .ddev/commands/db/mysqldump.example | 7 + .ddev/commands/host/README.txt | 18 +++ .ddev/commands/host/mysqlworkbench.example | 31 +++++ .ddev/commands/host/phpstorm.example | 8 ++ .ddev/commands/host/solrtail.example | 10 ++ .ddev/commands/solr/README.txt | 24 ++++ .ddev/commands/solr/solrtail.example | 12 ++ .ddev/commands/web/README.txt | 20 +++ .ddev/commands/web/drush | 7 + .ddev/commands/web/drush.example | 7 + .ddev/commands/web/reload-nginx.example | 7 + .ddev/config.yaml | 155 +++++++++++++++++++++ .ddev/homeadditions/README.txt | 6 + .ddev/homeadditions/bash_aliases.example | 5 + 17 files changed, 361 insertions(+) create mode 100644 .ddev/.gitignore 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/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 create mode 100755 .ddev/commands/web/drush.example create mode 100755 .ddev/commands/web/reload-nginx.example create mode 100644 .ddev/config.yaml create mode 100755 .ddev/homeadditions/README.txt create mode 100755 .ddev/homeadditions/bash_aliases.example diff --git a/.ddev/.gitignore b/.ddev/.gitignore new file mode 100644 index 0000000..9dc56c8 --- /dev/null +++ b/.ddev/.gitignore @@ -0,0 +1,19 @@ +#ddev-generated: Automatically generated ddev .gitignore. +# You can remove the above line if you want to edit and maintain this file yourself. + +/import.yaml +/docker-compose.yaml +/db_snapshots +/sequelpro.spf +/import-db +/.bgsync* +/config.*.y*ml +/.webimageBuild +/.dbimageBuild +/.bgsyncimageBuild +/.sshimageBuild +/.webimageExtra +/.dbimageExtra +/.webimageBuild +/.dbimageBuild +/*-build/Dockerfile.example diff --git a/.ddev/commands/db/README.txt b/.ddev/commands/db/README.txt new file mode 100755 index 0000000..97e4fd6 --- /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 0000000..23a06db --- /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 0000000..be25368 --- /dev/null +++ b/.ddev/commands/db/mysqldump.example @@ -0,0 +1,7 @@ +#!/bin/bash + +## 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 0000000..773f980 --- /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/mysqlworkbench.example b/.ddev/commands/host/mysqlworkbench.example new file mode 100755 index 0000000..fe40d94 --- /dev/null +++ b/.ddev/commands/host/mysqlworkbench.example @@ -0,0 +1,31 @@ +#!/bin/bash + +## 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 0000000..d4e8ffc --- /dev/null +++ b/.ddev/commands/host/phpstorm.example @@ -0,0 +1,8 @@ +#!/bin/bash + +## 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 0000000..9ebba68 --- /dev/null +++ b/.ddev/commands/host/solrtail.example @@ -0,0 +1,10 @@ +#!/bin/bash + +## 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/latest/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 0000000..da5bb83 --- /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 0000000..628450e --- /dev/null +++ b/.ddev/commands/solr/solrtail.example @@ -0,0 +1,12 @@ +#!/bin/bash + +## 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 0000000..9847dc1 --- /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 b/.ddev/commands/web/drush new file mode 100755 index 0000000..359811b --- /dev/null +++ b/.ddev/commands/web/drush @@ -0,0 +1,7 @@ +#!/bin/bash + +## 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/drush.example b/.ddev/commands/web/drush.example new file mode 100755 index 0000000..359811b --- /dev/null +++ b/.ddev/commands/web/drush.example @@ -0,0 +1,7 @@ +#!/bin/bash + +## 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 0000000..b8ce035 --- /dev/null +++ b/.ddev/commands/web/reload-nginx.example @@ -0,0 +1,7 @@ +#!/bin/bash + +## 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 new file mode 100644 index 0000000..61b5c3d --- /dev/null +++ b/.ddev/config.yaml @@ -0,0 +1,155 @@ +APIVersion: v1.10.1 +name: agaric-coop +type: drupal8 +docroot: web +php_version: "7.2" +webserver_type: nginx-fpm +router_http_port: "80" +router_https_port: "443" +xdebug_enabled: false +additional_hostnames: [] +additional_fqdns: [] +mariadb_version: "10.2" +nfs_mount_enabled: false +provider: default +use_dns_when_possible: true +timezone: "" + + +# This config.yaml was created with ddev version v1.10.1 +# webimage: drud/ddev-webserver:v1.10.0 +# dbimage: drud/ddev-dbserver:v1.10.0-10.2 +# dbaimage: drud/phpmyadmin:v1.10.0 +# bgsyncimage: drud/ddev-bgsync:v1.10.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" + +# 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: + +# 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/#using-webcache_enabled-to-cache-the-project-directory + +# 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-import-db: +# - exec: drush cr +# - exec: drush updb diff --git a/.ddev/homeadditions/README.txt b/.ddev/homeadditions/README.txt new file mode 100755 index 0000000..784aaea --- /dev/null +++ b/.ddev/homeadditions/README.txt @@ -0,0 +1,6 @@ +Files in .ddev/homeadditions will be copied into the web container's home directory. + +An example bash_aliases.example is provided here. To make this file active you can either + +cp bash_aliases.example .bash_aliases +or ln -s bash_aliases.example .bash_aliases diff --git a/.ddev/homeadditions/bash_aliases.example b/.ddev/homeadditions/bash_aliases.example new file mode 100755 index 0000000..331f0d8 --- /dev/null +++ b/.ddev/homeadditions/bash_aliases.example @@ -0,0 +1,5 @@ +# To make this file active you can either +# cp bash_aliases.example .bash_aliases +# or ln -s bash_aliases.example .bash_aliases + +alias ll="ls -lhA"