diff --git a/.docksal/docksal.env b/.docksal/docksal.env index 6b5dac0..6347cf7 100644 --- a/.docksal/docksal.env +++ b/.docksal/docksal.env @@ -1,2 +1,8 @@ DOCKSAL_STACK=default DOCROOT=docroot +XDEBUG_ENABLED=1 +DATABASE_NAME=default +DATABASE_USERNAME=user +DATABASE_PASSWORD=user +DATABASE_HOST=db +ENVIRONMENT=local diff --git a/.docksal/docksal.yml b/.docksal/docksal.yml index 193899e..df9fb83 100644 --- a/.docksal/docksal.yml +++ b/.docksal/docksal.yml @@ -1 +1,71 @@ +# Basic LAMP stack + version: "2.1" + +services: + # Web + web: + hostname: web + image: docksal/web:2.1-apache2.4 + volumes: + - project_root:/var/www:ro,nocopy # Project root volume + labels: + - io.docksal.virtual-host=${VIRTUAL_HOST},*.${VIRTUAL_HOST} + - io.docksal.project-root=${PROJECT_ROOT} + environment: + - APACHE_DOCUMENTROOT=/var/www/${DOCROOT:-docroot} + - APACHE_BASIC_AUTH_USER + - APACHE_BASIC_AUTH_PASS + depends_on: + - cli + dns: + - ${DOCKSAL_DNS1} + - ${DOCKSAL_DNS2} + + # DB + db: + hostname: db + image: docksal/db:1.1-mysql-5.6 + ports: + - "${MYSQL_PORT_MAPPING:-3306}" + volumes: + - project_root:/var/www:ro,nocopy # Project root volume + - ${PROJECT_ROOT}/db:/docker-entrypoint-initdb.d:ro + environment: + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-root} + - MYSQL_USER=${MYSQL_USER:-user} + - MYSQL_PASSWORD=${MYSQL_PASSWORD:-user} + - MYSQL_DATABASE=${MYSQL_DATABASE:-default} + dns: + - ${DOCKSAL_DNS1} + - ${DOCKSAL_DNS2} + + # CLI - Used for all console commands and tools. + cli: + hostname: cli + image: docksal/cli:2.4-php7.2 + volumes: + - project_root:/var/www:rw,nocopy # Project root volume + - docksal_ssh_agent:/.ssh-agent:ro # Shared ssh-agent socket + environment: + - HOST_UID + - HOST_GID + - DOCROOT + - XDEBUG_ENABLED=${XDEBUG_ENABLED:-0} + - XDEBUG_CONFIG=remote_connect_back=0 remote_host=${DOCKSAL_HOST_IP} # Point xdebug to the host IP + - DATABASE_NAME + - DATABASE_USERNAME + - DATABASE_PASSWORD + - DATABASE_HOST + - ENVIRONMENT + dns: + - ${DOCKSAL_DNS1} + - ${DOCKSAL_DNS2} +# +# solr: +# extends: +# file: ${HOME}/.docksal/stacks/services.yml +# service: solr +# image: docksal/solr:7.5 +# environment: +# SOLR_DEFAULT_CONFIG_SET: search_api_solr_8.x-2.1 diff --git a/config/default/default/config_split.config_split.local.yml b/config/default/default/config_split.config_split.local.yml index 887c120..80aafd6 100644 --- a/config/default/default/config_split.config_split.local.yml +++ b/config/default/default/config_split.config_split.local.yml @@ -8,8 +8,9 @@ description: '' folder: ../config/default/local module: { } theme: { } -blacklist: { } +blacklist: + - system.site graylist: { } graylist_dependents: true graylist_skip_equal: true -weight: 0 +weight: 1 diff --git a/config/default/default/system.site.yml b/config/default/local/system.site.yml similarity index 100% rename from config/default/default/system.site.yml rename to config/default/local/system.site.yml diff --git a/config/default/production/system.site.yml b/config/default/production/system.site.yml new file mode 100644 index 0000000..13fc208 --- /dev/null +++ b/config/default/production/system.site.yml @@ -0,0 +1,14 @@ +uuid: 45a5db0b-dd4e-4889-b1a0-3160c60e17ef +name: 'Prod: Config Split Sample' +mail: me@joshfabean.com +slogan: '' +page: + 403: '' + 404: '' + front: /node +admin_compact_mode: false +weight_select_max: 100 +langcode: en +default_langcode: en +_core: + default_config_hash: yTxtFqBHnEWxQswuWvkjE8mKw2t8oKuCL1q8KnfHuGE