diff --git a/group_vars/all.yaml b/group_vars/all.yaml index 01309fc..d6e8e79 100644 --- a/group_vars/all.yaml +++ b/group_vars/all.yaml @@ -41,6 +41,11 @@ smtp_service_pass: HISTORY_PURGED_SECRET pki_domain: pki.atlantishq.de +SOUNDLIB_AWS_ACCESS_KEY_ID: HISTORY_PURGED_SECRET +SOUNDLIB_AWS_SECRET_ACCESS_KEY: HISTORY_PURGED_SECRET +SOUNDLIB_S3_ENDPOINT: HISTORY_PURGED_SECRET + + # overwritten in monitoring master group var monitoring_master: false diff --git a/roles/docker-deployments/tasks/main.yaml b/roles/docker-deployments/tasks/main.yaml index d9a40f2..b72a6b4 100644 --- a/roles/docker-deployments/tasks/main.yaml +++ b/roles/docker-deployments/tasks/main.yaml @@ -51,6 +51,7 @@ - reactive-resume - hedgedoc - atlantis-verify + - soundlib-interface - name: Copy AtlantisHub config copy: @@ -95,6 +96,7 @@ - reactive-resume - hedgedoc - atlantis-verify + - soundlib-interface - name: Copy compose templates template: @@ -114,6 +116,7 @@ - reactive-resume - hedgedoc - atlantis-verify + - soundlib-interface - name: Log into private registry docker_login: @@ -141,6 +144,7 @@ - reactive-resume - hedgedoc - atlantis-verify + - soundlib-interface - name: OAuth2Proxy directories file: @@ -153,6 +157,7 @@ - grafana - async-icinga - atlantis-verify + - soundlib-interface - name: include services ports include_vars: services.yaml @@ -167,6 +172,7 @@ - grafana - async-icinga - atlantis-verify + - soundlib-interface - name: Deploy OAuth2Proxy community.docker.docker_compose: @@ -178,3 +184,4 @@ - grafana - async-icinga - atlantis-verify + - soundlib-interface diff --git a/roles/docker-deployments/templates/soundlib-interface.yaml b/roles/docker-deployments/templates/soundlib-interface.yaml new file mode 100644 index 0000000..a8760c5 --- /dev/null +++ b/roles/docker-deployments/templates/soundlib-interface.yaml @@ -0,0 +1,14 @@ +version: '3' +services: + soundlib: + image: harbor-registry.atlantishq.de/atlantishq/atlantis-soundlib:latest + restart: always + ports: + - "6014:5000" + environment: + S3_BUCKET: soundlib + AWS_ACCESS_KEY_ID: {{ SOUNDLIB_AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: {{ SOUNDLIB_AWS_SECRET_ACCESS_KEY }} + S3_ENDPOINT: {{ SOUNDLIB_S3_ENDPOINT }} + volumes: + - /data/soundlib/:/app/instance/ diff --git a/roles/web1/tasks/main.yaml b/roles/web1/tasks/main.yaml index 304c4d3..f4338a7 100644 --- a/roles/web1/tasks/main.yaml +++ b/roles/web1/tasks/main.yaml @@ -42,7 +42,6 @@ with_items: - python-flask-picture-factory - simple-log-server - - soundlib-interface - name: Ensure Ownership to www-data file: @@ -53,7 +52,6 @@ with_items: - python-flask-picture-factory - simple-log-server - - soundlib-interface - name: Deploy OIDC config (config) template: @@ -64,7 +62,6 @@ with_items: - python-flask-picture-factory - simple-log-server - - soundlib-interface - name: SLS Config copy: @@ -82,7 +79,6 @@ with_items: - python-flask-picture-factory - simple-log-server - - soundlib-interface - name: OAuth2Proxy directories file: @@ -92,7 +88,6 @@ with_items: - python-flask-picture-factory - simple-log-server - - soundlib-interface - name: Deploy OAuth2Proxy compose files template: @@ -100,7 +95,6 @@ dest: "/opt/oauth2proxy/{{ item }}/docker-compose.yaml" with_items: - simple-log-server - - soundlib-interface - python-flask-picture-factory - name: Template Systemd Units @@ -112,13 +106,11 @@ path : "/var/www/python-flask-picture-factory", external_oidc : true } - { name : "serien-ampel", path : "/var/www/serien-ampel" } - { name : "simple-log-server", path : "/var/www/simple-log-server", external_oidc : true } - - { name : "soundlib-interface", path : "/var/www/soundlib-interface", external_oidc : true } notify: - daemon reload - systemctl restart image-factory - systemctl restart serien-ampel - systemctl restart simple-log-server - - systemctl restart soundlib-interface - meta: flush_handlers @@ -127,7 +119,6 @@ project_src: /opt/oauth2proxy/{{ item }}/ pull: true with_items: - - soundlib-interface - simple-log-server - python-flask-picture-factory @@ -140,7 +131,6 @@ - python-flask-picture-factory - serien-ampel - simple-log-server - - soundlib-interface - name: event poller cronjob cron: diff --git a/vars/services.yaml b/vars/services.yaml index 1998595..427d398 100644 --- a/vars/services.yaml +++ b/vars/services.yaml @@ -5,8 +5,6 @@ services: port: 5001 simple-log-server: port: 5002 - soundlib-interface: - port: 5003 cert-manager: port: 5000 tmnf-replay-server: @@ -23,3 +21,5 @@ services: port: 5006 atlantis-verify: port: 5013 + soundlib-interface: + port: 5014