Move matrix-bridge-mx-puppet-groupme to its own container network

roles/custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml

@@ -40,11 +40,20 @@ matrix_mx_puppet_groupme_provisioning_whitelist:
 # "@.*:yourserver.com" disallow users on a specific homeserver
 matrix_mx_puppet_groupme_provisioning_blacklist: []
 
+matrix_mx_puppet_groupme_container_network: ""
+
+matrix_mx_puppet_groupme_container_additional_networks: "{{ matrix_mx_puppet_groupme_container_additional_networks_auto + matrix_mx_puppet_groupme_container_additional_networks_custom }}"
+matrix_mx_puppet_groupme_container_additional_networks_auto: []
+matrix_mx_puppet_groupme_container_additional_networks_custom: []
+
 # A list of extra arguments to pass to the container
 matrix_mx_puppet_groupme_container_extra_arguments: []
 
 # List of systemd services that matrix-puppet-groupme.service depends on.
-matrix_mx_puppet_groupme_systemd_required_services_list: ['docker.service']
+matrix_mx_puppet_groupme_systemd_required_services_list: "{{ matrix_mx_puppet_groupme_systemd_required_services_list_default + matrix_mx_puppet_groupme_systemd_required_services_list_auto + matrix_mx_puppet_groupme_systemd_required_services_list_custom }}"
+matrix_mx_puppet_groupme_systemd_required_services_list_default: ['docker.service']
+matrix_mx_puppet_groupme_systemd_required_services_list_auto: []
+matrix_mx_puppet_groupme_systemd_required_services_list_custom: []
 
 # List of systemd services that matrix-puppet-groupme.service wants
 matrix_mx_puppet_groupme_systemd_wanted_services_list: []
@@ -55,6 +64,9 @@ matrix_mx_puppet_groupme_homeserver_token: ''
 # Can be set to enable automatic double-puppeting via Shared Secret Auth (https://github.com/devture/matrix-synapse-shared-secret-auth).
 matrix_mx_puppet_groupme_login_shared_secret: ''
 
+matrix_mx_puppet_groupme_presence_enabled: true
+matrix_mx_puppet_groupme_presence_interval: 5000
+
 matrix_mx_puppet_groupme_database_engine: sqlite
 
 matrix_mx_puppet_groupme_sqlite_database_path_local: "{{ matrix_mx_puppet_groupme_data_path }}/database.db"

roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml

@@ -113,6 +113,11 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
 
+- name: Ensure mx-puppet-groupme container network is created
+  community.general.docker_network:
+    name: "{{ matrix_mx_puppet_groupme_container_network }}"
+    driver: bridge
+
 - name: Ensure matrix-mx-puppet-groupme.service installed
   ansible.builtin.template:
     src: "{{ role_path }}/templates/systemd/matrix-mx-puppet-groupme.service.j2"

roles/custom/matrix-bridge-mx-puppet-groupme/tasks/validate_config.yml

@@ -10,3 +10,4 @@
     - {'name': 'matrix_mx_puppet_groupme_homeserver_address', when: true}
     - {'name': 'matrix_mx_puppet_groupme_homeserver_token', when: true}
     - {'name': 'matrix_mx_puppet_groupme_database_hostname', when: "{{ matrix_mx_puppet_groupme_database_engine == 'postgres' }}"}
+    - {'name': 'matrix_mx_puppet_groupme_container_network', when: true}

roles/custom/matrix-bridge-mx-puppet-groupme/templates/config.yaml.j2

@@ -23,9 +23,9 @@ bridge:
 
 presence:
   # Bridge GroupMe online/offline status
-  enabled: true
+  enabled: {{ matrix_mx_puppet_groupme_presence_enabled | to_json }}
   # How often to send status to the homeserver in milliseconds
-  interval: 5000
+  interval: {{ matrix_mx_puppet_groupme_presence_enabled | to_json }}
 
 provisioning:
   # Regex of Matrix IDs allowed to use the puppet bridge

roles/custom/matrix-bridge-mx-puppet-groupme/templates/systemd/matrix-mx-puppet-groupme.service.j2

@@ -19,20 +19,28 @@ ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_s
 # Intentional delay, so that the homeserver (we likely depend on) can manage to start.
 ExecStartPre={{ matrix_host_command_sleep }} 5
 
-ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name matrix-mx-puppet-groupme \
+ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
+			--rm \
+			--name=matrix-mx-puppet-groupme \
 			--log-driver=none \
 			--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
 			--cap-drop=ALL \
-			--network={{ matrix_docker_network }} \
+			--network={{ matrix_mx_puppet_groupme_container_network }} \
 			-e CONFIG_PATH=/config/config.yaml \
 			-e REGISTRATION_PATH=/config/registration.yaml \
-			-v {{ matrix_mx_puppet_groupme_config_path }}:/config:z \
-			-v {{ matrix_mx_puppet_groupme_data_path }}:/data:z \
+			--mount type=bind,src={{ matrix_mx_puppet_groupme_config_path }},dst=/config \
+			--mount type=bind,src={{ matrix_mx_puppet_groupme_data_path }},dst=/data \
 			{% for arg in matrix_mx_puppet_groupme_container_extra_arguments %}
 			{{ arg }} \
 			{% endfor %}
 			{{ matrix_mx_puppet_groupme_docker_image }}
 
+{% for network in matrix_mx_puppet_groupme_container_additional_networks %}
+ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mx-puppet-groupme
+{% endfor %}
+
+ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-mx-puppet-groupme
+
 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-mx-puppet-groupme 2>/dev/null || true'
 ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-mx-puppet-groupme 2>/dev/null || true'
 Restart=always