Initial work on matrix-homeserver-proxy role and eliminating matrix-nginx-proxy

This is still very far from usable.

Various bridges and bots are still talking to
`matrix-nginx-proxy` instead of the new `matrix-homeserver-proxy` role.
These services need to be reworked. While reworking them,
various cleanups are being done as well as adding Traefik-labels to
those that need them.

roles/custom/matrix-bot-matrix-reminder-bot/defaults/main.yml

@@ -24,13 +24,21 @@ matrix_bot_matrix_reminder_bot_command_prefix: "!"
 # A list of extra arguments to pass to the container
 matrix_bot_matrix_reminder_bot_container_extra_arguments: []
 
+matrix_bot_matrix_reminder_bot_container_network: ""
+
+matrix_bot_matrix_reminder_bot_container_additional_networks: "{{ matrix_bot_matrix_reminder_bot_container_additional_networks_auto + matrix_bot_matrix_reminder_bot_container_additional_networks_custom }}"
+matrix_bot_matrix_reminder_bot_container_additional_networks_auto: []
+matrix_bot_matrix_reminder_bot_container_additional_networks_custom: []
+
 # List of systemd services that matrix-bot-matrix-reminder-bot.service depends on
-matrix_bot_matrix_reminder_bot_systemd_required_services_list: ['docker.service']
+matrix_bot_matrix_reminder_bot_systemd_required_services_list: "{{ matrix_bot_matrix_reminder_bot_systemd_required_services_list_default + matrix_bot_matrix_reminder_bot_systemd_required_services_list_auto + matrix_bot_matrix_reminder_bot_systemd_required_services_list_custom }}"
+matrix_bot_matrix_reminder_bot_systemd_required_services_list_default: ['docker.service']
+matrix_bot_matrix_reminder_bot_systemd_required_services_list_auto: []
+matrix_bot_matrix_reminder_bot_systemd_required_services_list_custom: []
 
 # List of systemd services that matrix-bot-matrix-reminder-bot.service wants
 matrix_bot_matrix_reminder_bot_systemd_wanted_services_list: []
 
-
 # Database-related configuration fields.
 #
 # To use SQLite, stick to these defaults.
@@ -68,7 +76,7 @@ matrix_bot_matrix_reminder_bot_matrix_user_id: '@{{ matrix_bot_matrix_reminder_b
 # The password that the bot uses to authenticate.
 matrix_bot_matrix_reminder_bot_matrix_user_password: ''
 
-matrix_bot_matrix_reminder_bot_matrix_homeserver_url: "{{ matrix_homeserver_container_url }}"
+matrix_bot_matrix_reminder_bot_matrix_homeserver_url: ""
 
 # The timezone to use when creating reminders.
 # Examples: 'Europe/London', 'Etc/UTC'

roles/custom/matrix-bot-matrix-reminder-bot/tasks/validate_config.yml

@@ -8,6 +8,8 @@
   with_items:
     - {'name': 'matrix_bot_matrix_reminder_bot_matrix_user_password', when: true}
     - {'name': 'matrix_bot_matrix_reminder_bot_reminders_timezone', when: true}
+    - {'name': 'matrix_bot_matrix_reminder_bot_container_network', when: true}
+    - {'name': 'matrix_bot_matrix_reminder_bot_matrix_homeserver_url', when: true}
     - {'name': 'matrix_bot_matrix_reminder_bot_database_hostname', when: "{{ matrix_bot_matrix_reminder_bot_database_engine == 'postgres' }}"}
 
 - name: (Deprecation) Catch and report renamed matrix-reminder-bot settings

roles/custom/matrix-bot-matrix-reminder-bot/templates/systemd/matrix-bot-matrix-reminder-bot.service.j2

@@ -16,12 +16,14 @@ Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}"
 ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-bot-matrix-reminder-bot 2>/dev/null || true'
 ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-bot-matrix-reminder-bot 2>/dev/null || true'
 
-ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name matrix-bot-matrix-reminder-bot \
+ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
+			--rm \
+			--name=matrix-bot-matrix-reminder-bot \
 			--log-driver=none \
 			--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
 			--cap-drop=ALL \
 			--read-only \
-			--network={{ matrix_docker_network }} \
+			--network={{ matrix_bot_matrix_reminder_bot_container_network }} \
 			-e 'TZ={{ matrix_bot_matrix_reminder_bot_reminders_timezone }}' \
 			--mount type=bind,src={{ matrix_bot_matrix_reminder_bot_config_path }},dst=/config,ro \
 			--mount type=bind,src={{ matrix_bot_matrix_reminder_bot_data_path }},dst=/data \
@@ -32,6 +34,12 @@ ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name
 			{{ matrix_bot_matrix_reminder_bot_docker_image }} \
 			-c "matrix-reminder-bot /config/config.yaml"
 
+{% for network in matrix_bot_matrix_reminder_bot_container_additional_networks %}
+ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-matrix-reminder-bot
+{% endfor %}
+
+ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-bot-matrix-reminder-bot
+
 ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-bot-matrix-reminder-bot 2>/dev/null || true'
 ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-bot-matrix-reminder-bot 2>/dev/null || true'
 Restart=always