Feature/drupal 10

.docker/data/.gitignore

@@ -0,0 +1,5 @@
+# Ignore everything in this directory
+README.md
+# Except this file
+!.gitignore
+!Readme.md

.docker/data/README.md

@@ -0,0 +1,26 @@
+# .docker/data
+
+Please map persistent volumes to this directory on the servers.
+
+If a container needs to persist data between restarts you can map the relevant files in the container to ``docker/data/<container-name>`.
+
+## RabbitMQ example
+If you are using RabbitMQ running in a container as a message broker you need to configure a persistent volume for RabbitMQs data directory to avoid losing message on container restarts.
+
+```yaml
+# docker-compose.server.override.yml
+
+services:
+ rabbit:
+ image: rabbitmq:3.9-management-alpine
+ hostname: "${COMPOSE_PROJECT_NAME}"
+ networks:
+ - app
+ - frontend
+ environment:
+ - "RABBITMQ_DEFAULT_USER=${RABBITMQ_USER}"
+ - "RABBITMQ_DEFAULT_PASS=${RABBITMQ_PASSWORD}"
+ - "RABBITMQ_ERLANG_COOKIE=${RABBITMQ_ERLANG_COOKIE}"
+ volumes:
+ - ".docker/data/rabbitmq:/var/lib/rabbitmq/mnesia/"
+```

.docker/nginx.conf

@@ -0,0 +1,39 @@
+worker_processes auto;
+
+error_log /var/log/nginx/error.log notice;
+pid /tmp/nginx.pid;
+
+events {
+ worker_connections 1024;
+}
+
+
+http {
+ proxy_temp_path /tmp/proxy_temp;
+ client_body_temp_path /tmp/client_temp;
+ fastcgi_temp_path /tmp/fastcgi_temp;
+ uwsgi_temp_path /tmp/uwsgi_temp;
+ scgi_temp_path /tmp/scgi_temp;
+
+ include /etc/nginx/mime.types;
+ default_type application/octet-stream;
+
+ set_real_ip_from 172.16.0.0/8;
+ real_ip_recursive on;
+ real_ip_header X-Forwarded-For;
+
+ log_format main '$http_x_real_ip - $remote_user [$time_local] "$request" '
+ '$status $body_bytes_sent "$http_referer" '
+ '"$http_user_agent" "$http_x_forwarded_for"';
+
+ access_log /var/log/nginx/access.log main;
+
+ sendfile on;
+ #tcp_nopush on;
+
+ keepalive_timeout 65;
+
+ gzip on;
+
+ include /etc/nginx/conf.d/*.conf;
+}

.docker/vhost.conf

@@ -54,6 +54,10 @@ server {
  }
 
  location ~ '\.php$|^/update.php' {
+ fastcgi_buffers 16 32k;
+ fastcgi_buffer_size 64k;
+ fastcgi_busy_buffers_size 64k;
+
  fastcgi_split_path_info ^(.+?\.php)(|/.*)$;
  include fastcgi_params;
 
@@ -82,6 +86,16 @@ server {
  log_not_found off;
  }
 
+ # Enforce clean URLs
+ # Removes index.php from urls like:
+ # www.example.com/index.php/my-page --> www.example.com/my-page
+ #
+ # Could be done with 301 for permanent or other redirect codes.
+ absolute_redirect off;
+ if ($request_uri ~* "^(.*/)index\.php/(.*)") {
+ return 301 /$2;
+ }
+
  error_log /dev/stderr;
- access_log /dev/stdout;
+ access_log /dev/stdout main;
 }

web/.gitattributes → .gitattributes

@@ -19,24 +19,24 @@
 *.config text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.css text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.dist text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.html text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html
-*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
-*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
+*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.js text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.json text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.lock text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.map text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.md text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
-*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
+*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.po text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.script text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.sql text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.svg text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.twig text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.txt text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2

.github/workflows/pr.yaml

@@ -0,0 +1,71 @@
+on: pull_request
+name: Review
+jobs:
+ changelog:
+ runs-on: ubuntu-latest
+ name: Changelog should be updated
+ strategy:
+ fail-fast: false
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ with:
+ fetch-depth: 2
+
+ - name: Git fetch
+ run: git fetch
+
+ - name: Check that changelog has been updated.
+ run: git diff --exit-code origin/${{ github.base_ref }} -- CHANGELOG.md && exit 1 || exit 0
+
+ test-composer-files:
+ name: Validate composer
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@master
+ - name: Setup PHP, with composer and extensions
+ uses: shivammathur/setup-php@v2
+ with:
+ php-version: 8.1
+ extensions: ctype, dom, iconv, json, zip, gd, soap
+ coverage: none
+ tools: composer:v2
+ # https://github.com/shivammathur/setup-php#cache-composer-dependencies
+ - name: Get composer cache directory
+ id: composer-cache
+ run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+ - name: Cache dependencies
+ uses: actions/cache@v2
+ with:
+ path: ${{ steps.composer-cache.outputs.dir }}
+ key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+ restore-keys: ${{ runner.os }}-composer-
+ - name: Validate composer files
+ run: |
+ composer validate composer.json
+
+ install-site:
+ if: ${{ false }} # Disable - Needs to be tested.
+ name: Check that site can be installed
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@master
+
+ - name: Install site
+ run: |
+ docker network create frontend
+ docker compose pull
+ docker compose up --detach
+
+ # Important: Use --no-interaction to make https://getcomposer.org/doc/06-config.md#discard-changes have effect.
+ docker compose exec --user root phpfpm composer install --no-interaction
+
+ # Install the site
+ docker compose exec --user root phpfpm vendor/bin/drush site:install minimal --existing-config --yes
+
+ # Build theme assets
+ docker compose run --rm node yarn --cwd /app/web/themes/custom/hoeringsportal install
+ docker compose run --rm node yarn --cwd /app/web/themes/custom/hoeringsportal build
+
+ # Open the site
+ echo $(docker compose exec phpfpm vendor/bin/drush --uri=http://$(docker compose port nginx 8080) user:login)

.gitignore

@@ -1,34 +1,47 @@
-# Ignore directories generated by Composer
-drush/contrib
-vendor
-web/core
-web/modules/contrib
-web/themes/contrib
-web/profiles/contrib
-
-# Ignore Drupal's file directory
-web/sites/*/files
-web/sites/*/private-files
-
-# Ignore SimpleTest multi-site environment.
-web/sites/simpletest
-
-# Ignore files generated by PhpStorm
-.idea
-
-# Local setup files
-services.local.yml
-settings.local.php
-docker.settings.local.php
-
-# Ignore local sync files
-.env-remote
-.pull-prod
-
-# Ignore local php.ini
-php.ini
-/.editorconfig
-/.gitattributes
-
-# Ignore local docker env file
-.env.docker.local
+# This file contains default .gitignore rules. To use it, copy it to .gitignore,
+# and it will cause files like your settings.php and user-uploaded files to be
+# excluded from Git version control. This is a common strategy to avoid
+# accidentally including private information in public repositories and patch
+# files.
+#
+# Because .gitignore can be specific to your site, this file has a different
+# name; updating Drupal core will not override your custom .gitignore file.
+
+# Ignore core when managing all of a project's dependencies with Composer
+# including Drupal core.
+core
+
+# Ignore dependencies that are managed with Composer.
+# Generally you should only ignore the root vendor directory. It's important
+# that core/assets/vendor and any other vendor directories within contrib or
+# custom module, theme, etc., are not ignored unless you purposely do so.
+/vendor/
+web/*/contrib
+
+# Ignore configuration files that may contain sensitive information.
+web/sites/default/settings.local.php
+web/sites/default/services.local.yml
+web/sites/default/files
+sites/*/services*.yml
+
+# Ignore paths that contain user-generated content.
+sites/*/files
+sites/*/private
+
+# Ignore multi-site test environment.
+sites/simpletest
+
+# If you prefer to store your .gitignore file in the sites/ folder, comment
+# or delete the previous settings and uncomment the following ones, instead.
+
+# Ignore configuration files that may contain sensitive information.
+# */settings*.php
+
+# Ignore paths that contain user-generated content.
+# */files
+# */private
+
+# Ignore multi-site test environment.
+# simpletest
+
+.idea

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## Unreleased
+* Drupal 10 new theme demo pages
+
+## 2.0.0
+* Upgrade to drupal 10
+* New theme
+
 ## 1.10.9
 * Update Drupal to 8.9.13
 * Update contrib modules to latest versions