Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
rimi-itk committed May 9, 2023
2 parents 63edc0a + b0ed097 commit 75615ea
Show file tree
Hide file tree
Showing 10 changed files with 344 additions and 266 deletions.
5 changes: 5 additions & 0 deletions .docker/data/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore
!Readme.md
26 changes: 26 additions & 0 deletions .docker/data/README.md
Original file line number Diff line number Diff line change
@@ -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/"
```
4 changes: 4 additions & 0 deletions .docker/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
19 changes: 18 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@ Nedenfor ses dato for release og beskrivelse af opgaver som er implementeret.

## [Under udvikling]

## [2.2.0]

* Opdaterede til [OS2Forms GetOrganized
1.1.1](https://github.com/OS2Forms/os2forms_get_organized/releases/tag/1.1.1)
* Opdaterede `Content Translation` modulets konfiguration for at give
`Selvbetjeningsdesigner` rollen adgang til oversættelse.
(<https://github.com/itk-dev/os2forms_selvbetjening/pull/184>)
* Opdaterede CPR-opslagskonfiguration
(<https://github.com/itk-dev/os2forms_selvbetjening/pull/182>)
* Opdaterede til [OS2Forms Organisation
1.1.1](https://github.com/itk-dev/os2forms_organisation/releases/tag/1.1.1)
med søgning.
* Opdaterede til [OS2Forms Digital post
1.2.3](https://github.com/itk-dev/os2forms_digital_post/releases/tag/1.2.3).

## [2.1.0]

* os2forms/os2forms_get_organized (1.1.0)
Expand Down Expand Up @@ -173,7 +188,9 @@ Nedenfor ses dato for release og beskrivelse af opgaver som er implementeret.

* GO borgersager

[Under udvikling]: https://github.com/itk-dev/os2forms_selvbetjening/compare/2.0.0...HEAD
[Under udvikling]: https://github.com/itk-dev/os2forms_selvbetjening/compare/2.2.0...HEAD
[2.2.0]: https://github.com/itk-dev/os2forms_selvbetjening/compare/2.1.0...2.2.0
[2.1.0]: https://github.com/itk-dev/os2forms_selvbetjening/compare/2.0.0...2.1.0
[2.0.0]: https://github.com/itk-dev/os2forms_selvbetjening/compare/1.7.1...2.0.0
[1.7.1]: https://github.com/itk-dev/os2forms_selvbetjening/compare/1.7.0...1.7.1
[1.7.0]: https://github.com/itk-dev/os2forms_selvbetjening/releases/tag/1.7.0
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"itk-dev/web_accessibility_statement": "^1.0",
"os2forms/os2forms_forloeb_profile": "^1.8",
"os2forms/os2forms_get_organized": "^1.0",
"os2forms/os2forms_organisation": "^1.0",
"os2forms/os2forms_organisation": "^1.1",
"os2forms/os2forms_rest_api": "^1.1",
"os2forms/os2forms_sync": "^1.1",
"os2forms/os2forms_webform_submission_log": "^1.0"
Expand Down
Loading

0 comments on commit 75615ea

Please sign in to comment.