diff --git a/roles/podman_link/tasks/main.yml b/roles/podman_link/tasks/main.yml index b67d02f..4f7c2b6 100644 --- a/roles/podman_link/tasks/main.yml +++ b/roles/podman_link/tasks/main.yml @@ -177,8 +177,10 @@ owner: "{{ podman_link_podman_rootless_user }}" mode: "0400" with_items: + - channels.network - frontend.network - link.network + - zammad.network become: true notify: - Restart Link diff --git a/roles/podman_link/templates/home/config/containers/systemd/bridge-whatsapp.container b/roles/podman_link/templates/home/config/containers/systemd/bridge-whatsapp.container index da98075..9a2e04c 100644 --- a/roles/podman_link/templates/home/config/containers/systemd/bridge-whatsapp.container +++ b/roles/podman_link/templates/home/config/containers/systemd/bridge-whatsapp.container @@ -7,7 +7,7 @@ Environment=BRIDGE_FRONTEND_URL=http://link:3000 ExposeHostPort=5000 Image=registry.gitlab.com/digiresilience/link/link-stack/bridge-whatsapp:{{ podman_link_stack_version }} Volume=/home/{{ podman_link_podman_rootless_user }}/bridge-whatsapp-data:/home/node/baileys:rw,Z -Network=link.network +Network=channels.network [Service] Restart=always diff --git a/roles/podman_link/templates/home/config/containers/systemd/bridge-worker.container b/roles/podman_link/templates/home/config/containers/systemd/bridge-worker.container index f916fc0..7ed34bc 100644 --- a/roles/podman_link/templates/home/config/containers/systemd/bridge-worker.container +++ b/roles/podman_link/templates/home/config/containers/systemd/bridge-worker.container @@ -9,6 +9,8 @@ ContainerName=bridge-worker EnvironmentFile=common-bridge.env Image=registry.gitlab.com/digiresilience/link/link-stack/bridge-worker:{{ podman_link_stack_version }} Network=link.network +Network=channels.network +Network=zammad.network [Service] Restart=always diff --git a/roles/podman_link/templates/home/config/containers/systemd/channels.network b/roles/podman_link/templates/home/config/containers/systemd/channels.network new file mode 100644 index 0000000..7b886b1 --- /dev/null +++ b/roles/podman_link/templates/home/config/containers/systemd/channels.network @@ -0,0 +1,2 @@ +[Network] +NetworkName=channels diff --git a/roles/podman_link/templates/home/config/containers/systemd/link.container b/roles/podman_link/templates/home/config/containers/systemd/link.container index b0d5609..4cfd232 100644 --- a/roles/podman_link/templates/home/config/containers/systemd/link.container +++ b/roles/podman_link/templates/home/config/containers/systemd/link.container @@ -16,6 +16,8 @@ EnvironmentFile=common-bridge.env ExposeHostPort=3000 Image=registry.gitlab.com/digiresilience/link/link-stack/link:{{ podman_link_stack_version }} Network=link.network +Network=channels.network +Network=zammad.network [Service] Restart=always diff --git a/roles/podman_link/templates/home/config/containers/systemd/opensearch-dashboards.container b/roles/podman_link/templates/home/config/containers/systemd/opensearch-dashboards.container index e23b0d4..0d0ac6d 100644 --- a/roles/podman_link/templates/home/config/containers/systemd/opensearch-dashboards.container +++ b/roles/podman_link/templates/home/config/containers/systemd/opensearch-dashboards.container @@ -5,12 +5,12 @@ PartOf=link.target [Container] ContainerName=opensearch-dashboards -#Environment=OPENSEARCH_USERNAME=admin -#Environment=OPENSEARCH_PASSWORD={{ podman_link_opensearch_password }} +Environment=OPENSEARCH_USERNAME=admin +Environment=OPENSEARCH_PASSWORD={{ podman_link_opensearch_password }} Image=registry.gitlab.com/digiresilience/link/link-stack/opensearch-dashboards:{{ podman_link_stack_version }} PublishPort=127.0.0.1:5601:5601 #Volume=/home/{{ podman_link_podman_rootless_user }}/opensearch-dashboards-config.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml -Network=link.network +Network=zammad.network [Service] Restart=always diff --git a/roles/podman_link/templates/home/config/containers/systemd/signal-cli-rest-api.container b/roles/podman_link/templates/home/config/containers/systemd/signal-cli-rest-api.container index 37406ab..8332001 100644 --- a/roles/podman_link/templates/home/config/containers/systemd/signal-cli-rest-api.container +++ b/roles/podman_link/templates/home/config/containers/systemd/signal-cli-rest-api.container @@ -10,7 +10,7 @@ Environment=SIGNAL_CLI_GID=1002 ExposeHostPort=8081 Image=registry.gitlab.com/digiresilience/link/link-stack/signal-cli-rest-api:{{ podman_link_stack_version }} Volume=/home/{{ podman_link_podman_rootless_user }}/signal-cli-rest-api-data:/home/.local/share/signal-cli:rw,Z -Network=link.network +Network=channels.network [Service] Restart=always diff --git a/roles/podman_link/templates/home/config/containers/systemd/zammad-init.container b/roles/podman_link/templates/home/config/containers/systemd/zammad-init.container index 27c7258..cfcc070 100644 --- a/roles/podman_link/templates/home/config/containers/systemd/zammad-init.container +++ b/roles/podman_link/templates/home/config/containers/systemd/zammad-init.container @@ -10,7 +10,7 @@ Image=registry.gitlab.com/digiresilience/link/link-stack/zammad:{{ podman_link_s Volume=/home/{{ podman_link_podman_rootless_user }}/zammad-config-nginx:/etc/nginx/sites-enabled:rw,z Volume=/home/{{ podman_link_podman_rootless_user }}/zammad-var:/opt/zammad/var:rw,z Volume=/home/{{ podman_link_podman_rootless_user }}/zammad-storage:/opt/zammad/storage:ro,z -Network=link.network +Network=zammad.network [Service] Restart=on-failure diff --git a/roles/podman_link/templates/home/config/containers/systemd/zammad-memcached.container b/roles/podman_link/templates/home/config/containers/systemd/zammad-memcached.container index 24f130f..91ef061 100644 --- a/roles/podman_link/templates/home/config/containers/systemd/zammad-memcached.container +++ b/roles/podman_link/templates/home/config/containers/systemd/zammad-memcached.container @@ -5,7 +5,7 @@ PartOf=zammad-storage.target ContainerName=zammad-memcached Exec=memcached -m 256M Image=registry.gitlab.com/digiresilience/link/link-stack/memcached:{{ podman_link_stack_version }} -Network=link.network +Network=zammad.network ExposeHostPort=11211 [Service] diff --git a/roles/podman_link/templates/home/config/containers/systemd/zammad-nginx.container b/roles/podman_link/templates/home/config/containers/systemd/zammad-nginx.container index 3f67689..f7c57f0 100644 --- a/roles/podman_link/templates/home/config/containers/systemd/zammad-nginx.container +++ b/roles/podman_link/templates/home/config/containers/systemd/zammad-nginx.container @@ -11,7 +11,7 @@ ExposeHostPort=8080 Image=registry.gitlab.com/digiresilience/link/link-stack/zammad:{{ podman_link_stack_version }} Volume=/home/{{ podman_link_podman_rootless_user }}/zammad-config-nginx:/etc/nginx/sites-enabled:rw,z Volume=/home/{{ podman_link_podman_rootless_user }}/zammad-var:/opt/zammad/var:ro,z -Network=link.network +Network=zammad.network Network=frontend.network [Service] diff --git a/roles/podman_link/templates/home/config/containers/systemd/zammad-opensearch.container b/roles/podman_link/templates/home/config/containers/systemd/zammad-opensearch.container index 432bd34..3f45ea1 100644 --- a/roles/podman_link/templates/home/config/containers/systemd/zammad-opensearch.container +++ b/roles/podman_link/templates/home/config/containers/systemd/zammad-opensearch.container @@ -20,7 +20,7 @@ PublishPort=127.0.0.1:9200:9200 PublishPort=127.0.0.1:9600:9600 Volume=/home/{{ podman_link_podman_rootless_user }}/opensearch-data:/usr/share/opensearch/data:rw,Z Volume=/home/{{ podman_link_podman_rootless_user }}/opensearch-config.yml:/usr/share/opensearch/config/opensearch-security/config.yml:rw,Z -Network=link.network +Network=zammad.network [Service] Restart=always diff --git a/roles/podman_link/templates/home/config/containers/systemd/zammad-postgresql.container b/roles/podman_link/templates/home/config/containers/systemd/zammad-postgresql.container index f91ee46..db2513e 100644 --- a/roles/podman_link/templates/home/config/containers/systemd/zammad-postgresql.container +++ b/roles/podman_link/templates/home/config/containers/systemd/zammad-postgresql.container @@ -12,7 +12,7 @@ Image=registry.gitlab.com/digiresilience/link/link-stack/postgresql:{{ podman_li Volume=/home/{{ podman_link_podman_rootless_user }}/postgresql-data:/var/lib/postgresql/data:rw,Z Volume=/home/{{ podman_link_podman_rootless_user }}/zammad-data:/opt/zammad:rw,z Volume=/home/{{ podman_link_podman_rootless_user }}/zammad-backup:/var/tmp/zammad:ro,z -Network=link.network +Network=zammad.network [Service] Restart=always diff --git a/roles/podman_link/templates/home/config/containers/systemd/zammad-railsserver.container b/roles/podman_link/templates/home/config/containers/systemd/zammad-railsserver.container index e0849e1..de138c6 100644 --- a/roles/podman_link/templates/home/config/containers/systemd/zammad-railsserver.container +++ b/roles/podman_link/templates/home/config/containers/systemd/zammad-railsserver.container @@ -12,7 +12,7 @@ Image=registry.gitlab.com/digiresilience/link/link-stack/zammad:{{ podman_link_s Volume=/home/{{ podman_link_podman_rootless_user }}/zammad-var:/opt/zammad/var:rw,z Volume=/home/{{ podman_link_podman_rootless_user }}/zammad-storage:/opt/zammad/storage:rw,z Volume=/home/{{ podman_link_podman_rootless_user }}/zammad-database.yml:/opt/zammad/config/database.yml:ro,z -Network=link.network +Network=zammad.network [Service] Restart=always diff --git a/roles/podman_link/templates/home/config/containers/systemd/zammad-redis.container b/roles/podman_link/templates/home/config/containers/systemd/zammad-redis.container index e1bede8..00b00c6 100644 --- a/roles/podman_link/templates/home/config/containers/systemd/zammad-redis.container +++ b/roles/podman_link/templates/home/config/containers/systemd/zammad-redis.container @@ -6,7 +6,7 @@ ContainerName=zammad-redis Environment=REDIS_PASSWORD={{ podman_link_zammad_redis_password }} Image=registry.gitlab.com/digiresilience/link/link-stack/redis:{{ podman_link_stack_version }} Volume=/home/{{ podman_link_podman_rootless_user }}/redis-data:/data:rw,Z -Network=link.network +Network=zammad.network [Service] Restart=always diff --git a/roles/podman_link/templates/home/config/containers/systemd/zammad-scheduler.container b/roles/podman_link/templates/home/config/containers/systemd/zammad-scheduler.container index 70c8a30..0a43f69 100644 --- a/roles/podman_link/templates/home/config/containers/systemd/zammad-scheduler.container +++ b/roles/podman_link/templates/home/config/containers/systemd/zammad-scheduler.container @@ -9,7 +9,7 @@ Exec=zammad-scheduler Image=registry.gitlab.com/digiresilience/link/link-stack/zammad:{{ podman_link_stack_version }} Volume=/home/{{ podman_link_podman_rootless_user }}/zammad-var:/opt/zammad/var:rw,z Volume=/home/{{ podman_link_podman_rootless_user }}/zammad-storage:/opt/zammad/storage:rw,z -Network=link.network +Network=zammad.network [Service] Restart=always diff --git a/roles/podman_link/templates/home/config/containers/systemd/zammad-websocket.container b/roles/podman_link/templates/home/config/containers/systemd/zammad-websocket.container index 8c4654d..1f1703c 100644 --- a/roles/podman_link/templates/home/config/containers/systemd/zammad-websocket.container +++ b/roles/podman_link/templates/home/config/containers/systemd/zammad-websocket.container @@ -9,7 +9,7 @@ Exec=zammad-websocket Image=registry.gitlab.com/digiresilience/link/link-stack/zammad:{{ podman_link_stack_version }} Volume=/home/{{ podman_link_podman_rootless_user }}/zammad-var:/opt/zammad/var:rw,z Volume=/home/{{ podman_link_podman_rootless_user }}/zammad-storage:/opt/zammad/storage:rw,z -Network=link.network +Network=zammad.network [Service] Restart=always diff --git a/roles/podman_link/templates/home/config/containers/systemd/zammad.network b/roles/podman_link/templates/home/config/containers/systemd/zammad.network new file mode 100644 index 0000000..3d68c3a --- /dev/null +++ b/roles/podman_link/templates/home/config/containers/systemd/zammad.network @@ -0,0 +1,2 @@ +[Network] +NetworkName=zammad