Merge branch 'develop' into feature/wer-and-cer

.docker/nginx.conf

@@ -18,7 +18,7 @@ http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
-    set_real_ip_from 172.16.0.0/8;
+    set_real_ip_from 172.16.0.0/16;
     real_ip_recursive on;
     real_ip_header X-Forwarded-For;
 

.docker/templates/default.conf.template

@@ -6,6 +6,11 @@ server {
 
     client_max_body_size ${NGINX_MAX_BODY_SIZE};
 
+    # This also needs to be set in the single server tag and not only in http.
+    set_real_ip_from 172.16.0.0/16;
+    real_ip_recursive on;
+    real_ip_header X-Forwarded-For;
+
     location = /favicon.ico {
         log_not_found off;
         access_log off;

.github/workflows/build_release.yml

@@ -0,0 +1,63 @@
+on:
+  push:
+    tags:
+      - '*.*.*'
+
+name: Create Github Release
+
+permissions:
+  contents: write
+
+env:
+  COMPOSE_USER: runner
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    env:
+      COMPOSER_ALLOW_SUPERUSER: 1
+      APP_ENV: prod
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Composer install
+        run: |
+          docker network create frontend
+          docker compose run --rm --user=root phpfpm composer install --no-dev -o --classmap-authoritative
+          docker compose run --rm --user=root phpfpm composer clear-cache
+
+      - name: Building assets for the frontend
+        run: |
+          docker compose run --rm node yarn install
+          docker compose run --rm node yarn build
+
+      - name: Build assets for Giv Din Stemme module
+        run: |
+          docker compose run --rm node yarn --cwd web/modules/custom/giv_din_stemme/ install
+          docker compose run --rm node yarn --cwd web/modules/custom/giv_din_stemme/ build
+
+      - name: Clean up
+        run: |
+          sudo chown -R runner:runner ./
+          rm -rf node_modules
+          rm -rf web/modules/custom/giv_din_stemme/node_modules
+
+      - name: Make assets dir
+        run: |
+          mkdir -p ../assets
+
+      - name: Create archive
+        run: |
+          tar --exclude='.git' -zcf ../assets/${{ github.event.repository.name }}-${{ github.ref_name }}.tar.gz ./
+
+      - name: Create checksum
+        run: |
+          cd ../assets
+          sha256sum ${{ github.event.repository.name }}-${{ github.ref_name }}.tar.gz > ../assets/checksum.txt
+
+      - name: Create a release in GitHub and uploads assets
+        run: gh release create ${{ github.ref_name }} --verify-tag --generate-notes ../assets/*.*
+        env:
+          GITHUB_TOKEN: ${{ github.TOKEN }}
+        shell: bash

.github/workflows/pr.yml

@@ -1,6 +1,10 @@
 on: pull_request
+
 name: Review
 
+env:
+  COMPOSE_USER: runner
+
 jobs:
   changelog:
     runs-on: ubuntu-latest
@@ -28,7 +32,7 @@ jobs:
 
       - name: Coding standards
         run: |
-          docker run --rm --volume "$PWD:/md" peterdavehello/markdownlint markdownlint $(git ls-files *.md)
+          docker run --rm --volume "$PWD:/md" itkdev/markdownlint $(git ls-files *.md)
 
   composer-normalize:
     name: composer-normalize

.woodpecker/deployment.yml

@@ -0,0 +1,41 @@
+when:
+  - event: release
+
+skip_clone: true
+
+steps:
+  - name: Ansible playbook
+    image: itkdev/ansible-plugin:1
+    pull: true
+    settings:
+      id:
+        from_secret: id
+      secret:
+        from_secret: secret
+      host:
+        from_secret: host
+      path:
+        from_secret: path
+      user:
+        from_secret: user
+      playbook: 'release'
+      pre_up:
+        - itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes cache:rebuild
+        - itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes deploy
+        # Fixes issue with 'Drupal\mysql\Driver\Database\mysql\Connection' not found
+        - itkdev-docker-compose-server run --rm phpfpm composer2 dump-autoload
+      cron:
+        cron:
+          minute: '*/5'
+          hour: '*'
+          day: '*'
+          month: '*'
+          weekday: '*'
+          job: 'itkdev-docker-compose-server exec phpfpm vendor/bin/drush --yes core:cron'
+#        whisper:
+#          minute: '0'
+#          hour: '3'
+#          day: '*'
+#          month: '*'
+#          weekday: '*'
+#          job: 'itkdev-docker-compose-server exec phpfpm vendor/bin/drush --yes giv-din-stemme:qualify:all'

.woodpecker/stg.yml

@@ -0,0 +1,33 @@
+when:
+  - branch: release/*
+    event: push
+
+skip_clone: true
+
+steps:
+  - name: Run test site update
+    image: itkdev/ansible-plugin:1
+    when:
+      branch: release/*
+      event: push
+    pull: true
+    settings:
+      id:
+        from_secret: id
+      secret:
+        from_secret: secret
+      host:
+        from_secret: stg_host
+      path:
+        from_secret: stg_path
+      user:
+        from_secret: user
+      actions:
+        - git reset --hard
+        - git fetch origin ${CI_COMMIT_BRANCH}
+        - git checkout ${CI_COMMIT_BRANCH}
+        - git pull
+        - itkdev-docker-compose-server up -d --force-recreate
+        - itkdev-docker-compose-server exec phpfpm composer install
+        - itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes cache:rebuild
+        - itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes deploy

CHANGELOG.md

@@ -12,7 +12,7 @@ See [keep a changelog] for information about writing changes to this log.
   * Modifies qualify command to only transcribe donations.
   * Makes commands calculating each of the metrics (WER, CER and similar_text)
 
-## [1.0.0] 2024-11-29
+## [1.0.0] - 2024-11-29
 
 * [PR-55](https://github.com/itk-dev/giv-din-stemme/pull/55)
   * Added Architectural decision record (ADR)
@@ -46,7 +46,7 @@ See [keep a changelog] for information about writing changes to this log.
 * [PR-41](https://github.com/itk-dev/giv-din-stemme/pull/41)
   Toggle button icon change
 * [PR-21](https://github.com/itk-dev/giv-din-stemme/pull/21)
-  Added web accessiblity statement
+  Added web accessibility statement
 * [PR-38](https://github.com/itk-dev/giv-din-stemme/pull/38)
   Added file data to metadata.
 * [PR-35](https://github.com/itk-dev/giv-din-stemme/pull/35)
@@ -83,6 +83,6 @@ See [keep a changelog] for information about writing changes to this log.
   Mobile optimization.
 * Initial project.
 
-
 [Unreleased]: https://github.com/itk-dev/doner-din-stemme/compare/1.0.0...HEAD
 [1.0.0]: https://github.com/itk-dev/doner-din-stemme/releases/tag/1.0.0
+[keep a changelog]: https://keepachangelog.com/en/1.1.0/

README.md

@@ -307,8 +307,8 @@ docker compose run --rm phpfpm composer coding-standards-check/twig-cs-fixer
 ```
 
 ```shell name=coding-standards-markdown
-docker run --platform linux/amd64 --rm --volume "$PWD:/md" peterdavehello/markdownlint markdownlint $(git ls-files *.md) --fix
-docker run --platform linux/amd64 --rm --volume "$PWD:/md" peterdavehello/markdownlint markdownlint $(git ls-files *.md)
+docker run --rm --volume "$PWD:/md" itkdev/markdownlint $(git ls-files *.md) --fix
+docker run --rm --volume "$PWD:/md" itkdev/markdownlint $(git ls-files *.md)
 ```
 
 ```shell name="coding-standards-assets"

docker-compose.server.oidc.yml

@@ -28,7 +28,6 @@ services:
       ASPNETCORE_URLS: https://+:443;http://+:80
       ASPNETCORE_Kestrel__Certificates__Default__Password: mock
       ASPNETCORE_Kestrel__Certificates__Default__Path: /tmp/config/.docker/oidc-server-mock/cert/docker.pfx
-
       ASPNETCORE_ENVIRONMENT: Development
       SERVER_OPTIONS_INLINE: |
         AccessTokenJwtType: JWT
@@ -37,17 +36,14 @@ services:
         Authentication:
           CookieSameSiteMode: Lax
           CheckSessionCookieSameSiteMode: Lax
-
       LOGIN_OPTIONS_INLINE: |
         {
           "AllowRememberLogin": false
         }
-
       LOGOUT_OPTIONS_INLINE: |
         {
           "AutomaticRedirectAfterSignOut": true
         }
-
       CLIENTS_CONFIGURATION_INLINE: |
         - ClientId: client-id
           ClientSecrets: [client-secret]
@@ -73,7 +69,6 @@ services:
             - '*'
           # https://github.com/Soluto/oidc-server-mock/issues/46#issuecomment-704845375
           RequirePkce: false
-
       # Needed to set custom claim types in "profile"
       # https://github.com/Soluto/oidc-server-mock/issues/123#issuecomment-1427129278
       # https://github.com/Soluto/oidc-server-mock/blob/master/README.md#simple-configuration
@@ -94,7 +89,6 @@ services:
             - name
             - zip
             - uuid
-
       USERS_CONFIGURATION_INLINE: |
         - SubjectId: 1
           Username: citizen1

docker-compose.server.override.yml

@@ -2,13 +2,9 @@ services:
   phpfpm:
     environment:
       - PHP_OPCACHE_VALIDATE_TIMESTAMPS=0
-      - PHP_PM_TYPE=static
-      - PHP_PM_MAX_CHILDREN=24
-      - PHP_PM_MAX_REQUESTS=10000
-      - PHP_POST_MAX_SIZE=18M
-      - PHP_UPLOAD_MAX_FILESIZE=15M
       - PHP_POST_MAX_SIZE=18M
       - PHP_UPLOAD_MAX_FILESIZE=15M
+
   nginx:
     environment:
       - NGINX_MAX_BODY_SIZE=20M

docker-compose.server.prod.yml

@@ -0,0 +1,10 @@
+services:
+  phpfpm:
+    volumes:
+      - ../../shared/settings.local.php:/app/web/sites/default/settings.local.php
+      - ../../shared/files:/app/web/sites/default/files
+      - ../../shared/private:/app/private
+
+  nginx:
+    volumes:
+      - ../../shared/files:/app/web/sites/default/files

docker-compose.yml

@@ -25,6 +25,7 @@ services:
 
   phpfpm:
     image: itkdev/php8.3-fpm:latest
+    user: ${COMPOSE_USER:-deploy}
     networks:
       - app
     extra_hosts:

web/modules/custom/giv_din_stemme/giv_din_stemme.permissions.yml

@@ -2,7 +2,6 @@ access giv din stemme:
   title: 'Access giv din stemme'
   description: 'Access to giv din stemme routes'
 
-
 view giv din stemme entity:
   title: 'View giv din stemme entity'
   description: 'View access to giv din stemme entity'

web/modules/custom/giv_din_stemme/giv_din_stemme.routing.yml

@@ -68,7 +68,7 @@ giv_din_stemme.test:
     _controller: '\Drupal\giv_din_stemme\Controller\GivDinStemmeController::test'
     _title: 'Test'
   requirements:
-    _permission: 'access content'
+    _permission: 'access giv din stemme'
   options:
     # The content depends on the browser user agent, so we disable caching.
     no_cache: TRUE