Merge pull request '🔧 Configure HTTPS ingress for radon' (!67) from radon-ingress into master

Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/67
Reviewed-by: dkdent <dkdent@netz39.de>
This commit is contained in:
Stefan Haun 2022-09-06 17:11:14 +00:00
commit 6ccca9b552

View file

@ -22,6 +22,17 @@
- role: docker_setup - role: docker_setup
vars: vars:
docker_data_root: "/srv/docker" docker_data_root: "/srv/docker"
- role: apache
- role: apache-letsencrypt # Uses configuration from dehydrated setup
- role: ansible-role-dehydrated
vars:
dehydrated_contact_email: "{{ server_admin }}"
dehydrated_domains:
- name: nodered.n39.eu
- name: rabbitmq.n39.eu
- name: pwr-meter-pulse-gw-19i.svc.n39.eu
- role: penguineer.dehydrated_cron
tasks: tasks:
- name: Ensure the mosquitto directories exist - name: Ensure the mosquitto directories exist
@ -75,14 +86,20 @@
TZ: Europe/Berlin TZ: Europe/Berlin
NODE_RED_ENABLE_PROJECTS: "true" NODE_RED_ENABLE_PROJECTS: "true"
ports: ports:
# - 127.0.0.1:9002:1880 - 127.0.0.1:9002:1880
- 9002:1880
volumes: volumes:
- "{{ nodered_data }}/data:/data" - "{{ nodered_data }}/data:/data"
detach: yes detach: yes
keep_volumes: yes keep_volumes: yes
restart_policy: unless-stopped restart_policy: unless-stopped
- name: Setup proxy site nodered.n39.eu
include_role:
name: setup-http-site-proxy
vars:
site_name: "nodered.n39.eu"
proxy_port: 9002
- name: Check if rabbitmq data dir exists - name: Check if rabbitmq data dir exists
ansible.builtin.stat: ansible.builtin.stat:
@ -103,19 +120,27 @@
- 5552:5552 - 5552:5552
- 5672:5672 - 5672:5672
- 25672:25672 - 25672:25672
- 15672:15672 - 127.0.0.1:15672:15672
env: env:
RABBITMQ_SECURE_PASSWORD: "yes" RABBITMQ_SECURE_PASSWORD: "yes"
volumes: volumes:
- "{{ rabbitmq_data }}/bitnami:/bitnami:rw" - "{{ rabbitmq_data }}/bitnami:/bitnami:rw"
- "{{ rabbitmq_data }}/etc_rabbitmq:/etc/rabbitmq:rw" - "{{ rabbitmq_data }}/etc_rabbitmq:/etc/rabbitmq:rw"
- name: Setup proxy site rabbitmq.n39.eu
include_role:
name: setup-http-site-proxy
vars:
site_name: "rabbitmq.n39.eu"
proxy_port: 15672
- name: Ensure Power Meter Pulse Gateway for 19i room is running - name: Ensure Power Meter Pulse Gateway for 19i room is running
docker_container: docker_container:
name: pwr-meter-pulse-gw-19i name: pwr-meter-pulse-gw-19i
image: "{{ pwr_meter_pulse_gw_image }}" image: "{{ pwr_meter_pulse_gw_image }}"
ports: ports:
# Wait for https://redmine.n39.eu/issues/755
# - 127.0.0.1:9003:8080 # - 127.0.0.1:9003:8080
- 9003:8080 - 9003:8080
env: env:
@ -126,7 +151,12 @@
PULSE_BINDING: "pwr-meter-pulse-19i" PULSE_BINDING: "pwr-meter-pulse-19i"
API_TOKEN: "{{ pwr_meter_api_token }}" API_TOKEN: "{{ pwr_meter_api_token }}"
# TODO HTTPS ingress, when #727 is resolved - name: Setup proxy site pwr-meter-pulse-gw-19i.svc.n39.eu
include_role:
name: setup-http-site-proxy
vars:
site_name: "pwr-meter-pulse-gw-19i.svc.n39.eu"
proxy_port: 9003
handlers: handlers: