update(element): bump version to 1.11.102

galaxy.yml

@@ -1,10 +1,13 @@
 namespace: finallycoffee
 name: matrix
-version: 0.1.2
+version: "0.1.8"
 readme: README.md
 authors:
 - transcaffeine <transcaffeine@finally.coffee>
 description: Various matrix-related ansible roles
+dependencies:
+  "community.docker": "^4.4.0"
+  "community.general": "^10.0.0"
 license_file: LICENSE.md
 build_ignore:
 - '*.tar.gz'

roles/cinny/defaults/main/config.yml

@@ -1,5 +1,4 @@
 ---
-cinny_testvar: abc
 cinny_config_complete: >-
   {{ cinny_config | default({})
   | combine(cinny_default_config | default({})) }}

roles/cinny/defaults/main/main.yml

@@ -1,7 +1,7 @@
 ---
 cinny_user: cinny
 cinny_state: "present"
-cinny_version: "4.2.2"
+cinny_version: "4.8.0"
 cinny_deployment_method: "docker"
 
 cinny_base_path: "/opt/cinny"

roles/cinny/docs/docker.md

@@ -14,7 +14,6 @@ are available under the `cinny_container_` prefix:
 - `labels`
 - `networks`
 - `etc_hosts`
-- `purge_networks`
 
 The following variables are pre-populated by the role, so override them with care:
 

roles/cinny/tasks/deploy-docker.yml

@@ -30,4 +30,3 @@
     networks: "{{ cinny_container_networks | default(omit) }}"
     etc_hosts: "{{ cinny_container_etc_hosts | default(omit) }}"
     restart_policy: "{{ cinny_container_restart_policy }}"
-    purge_networks: "{{ cinny_container_purge_networks | default(omit) }}"

roles/element/defaults/main/container.yml

@@ -11,12 +11,15 @@ element_container_image_registry: "docker.io"
 element_container_image_namespace: "vectorim"
 element_container_image_name: "element-web"
 element_container_image_tag: ~
+element_container_image_source: pull
+element_container_image_force_source: >-2
+  {{ element_container_image_tag | default(false, true) | bool }}
 element_container_name: "element-web"
 element_container_restart_policy: >-
   {{ (element_deployment_method == 'docker')
       | ternary('unless-stopped',
         (element_deployment_method == 'podman' |
-          ternary('on-failure', 'always'))
+          ternary('on-failure', 'always')))
   }}
 element_container_full_volumes: >-
   {{ element_container_default_volumes

roles/element/defaults/main/main.yml

@@ -1,7 +1,7 @@
 ---
 element_user: element
 element_state: "present"
-element_version: "1.11.82"
+element_version: "1.11.102"
 element_deployment_method: "docker"
 
 element_base_path: "/opt/element"
@@ -10,9 +10,9 @@ element_dist_path: "{{ element_source_path }}/dist"
 element_config_path: "{{ element_base_path }}/config"
 element_config_file: "{{ element_config_path }}/config.json"
 
-element_host_uid: >-
-  {{ element_user_info is defined
+element_host_uid: >-2
+  {{ ((element_user_info is defined) and ('uid' in element_user_info))
   | ternary(element_user_info.uid, element_user) }}
-element_host_gid: >-
-  {{ element_user_info is defined
+element_host_gid: >-2
+  {{ ((element_user_info is defined) and ('uid' in element_user_info))
   | ternary(element_user_info.group, element_user) }}

roles/element/docs/docker.md

@@ -14,7 +14,6 @@ are available under the `element_container_` prefix:
 - `labels`
 - `networks`
 - `etc_hosts`
-- `purge_networks`
 
 The following variables are pre-populated by the role, so override them with care:
 

roles/element/tasks/deploy-docker.yml

@@ -14,8 +14,8 @@
   community.docker.docker_image:
     name: "{{ element_container_image }}"
     state: "{{ element_state }}"
-    source: "{{ element_container_source }}"
-    force_source: "{{ element_container_image_tag | default(false, true) }}"
+    source: "{{ element_container_image_source }}"
+    force_source: "{{ element_container_image_force_source }}"
 
 - name: Ensure container '{{ element_container_name }}' is {{ element_state }}
   community.docker.docker_container:
@@ -23,11 +23,10 @@
     image: "{{ element_container_image }}"
     state: "{{ (element_state == 'present') | ternary('started', 'absent') }}"
     env: "{{ element_container_env | default(omit) }}"
-    user: "{{ element_container_user }}"
+    user: "{{ element_container_user | default(omit) }}"
     ports: "{{ element_container_ports | default(omit) }}"
     labels: "{{ element_container_labels | default(omit) }}"
     volumes: "{{ element_container_full_volumes }}"
     networks: "{{ element_container_networks | default(omit) }}"
     etc_hosts: "{{ element_container_etc_hosts | default(omit) }}"
     restart_policy: "{{ element_container_restart_policy }}"
-    purge_networks: "{{ element_container_purge_networks | default(omit) }}"

roles/element/tasks/deploy-podman.yml

@@ -3,8 +3,8 @@
   containers.podman.podman_image:
     name: "{{ element_container_image }}"
     state: "{{ element_state }}"
-    pull: "{{ element_container_source == 'pull' }}"
-    force: "{{ element_container_image_tag | default(false, true) }}"
+    pull: "{{ element_container_image_source == 'pull' }}"
+    force: "{{ element_container_image_force_source }}"
 
 - name: Ensure container '{{ element_container_name }}' is {{ element_state }}
   containers.podman.podman_container:
@@ -12,7 +12,7 @@
     image: "{{ element_container_image }}"
     state: "{{ (element_state == 'present') | ternary('started', 'absent') }}"
     env: "{{ element_container_env | default(omit) }}"
-    user: "{{ element_container_user }}"
+    user: "{{ element_container_user | default(omit) }}"
     ports: "{{ element_container_ports | default(omit) }}"
     labels: "{{ element_container_labels | default(omit) }}"
     volumes: "{{ element_container_full_volumes }}"

roles/element/vars/main.yml

@@ -1,5 +1,5 @@
 ---
-element_state:
+element_states:
   - present
   - absent
 

roles/hydrogen/defaults/main/container.yml

@@ -37,7 +37,6 @@ hydrogen_container_labels: ~
 hydrogen_container_ulimits: ~
 hydrogen_container_volumes: ~
 hydrogen_container_networks: ~
-hydrogen_container_purge_networks: ~
 hydrogen_container_dns_servers: ~
 hydrogen_container_etc_hosts: ~
 hydrogen_container_restart_policy: unless-stopped

roles/hydrogen/defaults/main/main.yml

@@ -1,7 +1,7 @@
 ---
 hydrogen_state: present
 hydrogen_user: hydrogen
-hydrogen_version: "0.5.0"
+hydrogen_version: "0.5.1"
 hydrogen_deployment_method: docker
 
 hydrogen_config_file: "/etc/hydrogen/config.json"

roles/hydrogen/tasks/deploy-docker.yml

@@ -22,8 +22,6 @@
     ulimits: "{{ hydrogen_container_ulimits | default(omit, true) }}"
     volumes: "{{ hydrogen_container_volumes }}"
     networks: "{{ hydrogen_container_networks | default(omit, true) }}"
-    purge_networks: >-2
-      {{ hydrogen_container_purge_networks | default(omit, true) }}
     dns_servers: >-2
       {{ hydrogen_container_dns_servers | default(omit, true) }}
     etc_hosts: >-2

roles/hydrogen/tasks/deploy-podman.yml

@@ -21,8 +21,6 @@
     ulimits: "{{ hydrogen_container_ulimits | default(omit, true) }}"
     volumes: "{{ hydrogen_container_volumes }}"
     network: "{{ hydrogen_container_networks | default(omit, true) }}"
-    purge_networks: >-2
-      {{ hydrogen_container_purge_networks | default(omit, true) }}
     dns_servers: >-2
       {{ hydrogen_container_dns_servers | default(omit, true) }}
     etc_hosts: >-2

roles/synapse/defaults/main/container.yml

@@ -30,7 +30,6 @@ synapse_container_ports: ~
 synapse_container_labels: ~
 synapse_container_ulimits: ~
 synapse_container_networks: ~
-synapse_container_purge_networks: ~
 synapse_container_dns_servers: ~
 synapse_container_etc_hosts: ~
 synapse_container_memory: ~

roles/synapse/defaults/main/homeserver.config.yml

@@ -23,8 +23,9 @@ synapse_default_config: >-
     | combine(synapse_metrics_config)
     | combine(synapse_api_config)
     | combine(synapse_push_config)
+    | combine(synapse_registration_config)
   }}
 
 synapse_homeserver_config: >-
   {{ synapse_default_config
-    | combine(synapse_config | default({})) }}
+    | combine(synapse_config | default({}), recursive=True) }}

roles/synapse/defaults/main/homeserver.registration.yml

@@ -0,0 +1,41 @@
+---
+synapse_config_enable_registration: false
+synapse_config_enable_registration_without_verification: false
+synapse_config_registrations_require_3pid: []
+synapse_config_registration_requires_token: true
+synapse_config_registration_shared_secret: ~
+synapse_config_registration_shared_secret_path: ~
+synapse_config_allowed_local_3pids: []
+synapse_config_enable_3pid_lookup: true
+
+synapse_config_bcrypt_rounds: 14
+synapse_config_allow_guest_access: false
+synapse_config_default_identity_server: ~
+synapse_config_enable_set_displayname: true
+synapse_config_enable_set_avatar_url: true
+synapse_config_enable_3pid_changes: true
+
+synapse_registration_base_config:
+  enable_set_displayname: "{{ synapse_config_enable_set_displayname }}"
+  enable_set_avatar_url: "{{ synapse_config_enable_set_avatar_url }}"
+  enable_3pid_changes: "{{ synapse_config_enable_3pid_changes }}"
+  allow_guest_access: "{{ synapse_config_allow_guest_access }}"
+  enable_registration: "{{ synapse_config_enable_registration }}"
+  enable_registration_without_verification: >-2
+    {{ synapse_config_enable_registration_without_verification }}
+  allowed_local_3pids: "{{ synapse_config_allowed_local_3pids }}"
+  enable_3pid_lookup: "{{ synapse_config_enable_3pid_lookup }}"
+  registrations_require_3pid: "{{ synapse_config_registrations_require_3pid }}"
+  registration_requires_token: "{{ synapse_config_registration_requires_token }}"
+  registration_shared_secret: "{{ synapse_config_registration_shared_secret }}"
+  registration_shared_secret_path: >-2
+    {{ synapse_config_registration_shared_secret_path }}
+  bcrypt_rounds: "{{ synapse_config_bcrypt_rounds }}"
+
+synapse_registration_config: >-2
+  {{
+    synapse_registration_base_config
+    | combine(({"default_identity_server": synapse_config_default_identity_server})
+      if (synapse_config_default_identity_server | default(false, true)
+        and synapse_config_default_identity_server | length > 0) else {})
+  }}

roles/synapse/defaults/main/main.yml

@@ -1,7 +1,7 @@
 ---
 synapse_user: synapse
 synapse_group: synapse
-synapse_version: "1.117.0"
+synapse_version: "1.131.0"
 synapse_state: "present"
 synapse_deployment_method: "docker"
 

roles/synapse/tasks/check.yml

@@ -28,5 +28,5 @@
     label: "{{ item.name }}"
   when: >-2
     item.when
-    and (item.name not in hostvars[ansible_host]
-        or hostvars[ansible_host][item.name] | length == 0)
+    and (item.name not in hostvars[inventory_hostname]
+        or hostvars[inventory_hostname][item.name] | length == 0)

roles/synapse/tasks/deploy-docker.yml

@@ -22,7 +22,6 @@
     ulimits: "{{ synapse_container_ulimits | default(omit, true) }}"
     volumes: "{{ synapse_container_all_volumes }}"
     networks: "{{ synapse_container_networks | default(omit, true) }}"
-    purge_networks: "{{ synapse_container_purge_networks | default(omit, true) }}"
     dns_servers: "{{ synapse_container_dns_servers | default(omit, true) }}"
     etc_hosts: "{{ synapse_container_etc_hosts | default(omit, true) }}"
     memory: "{{ synapse_container_memory | default(omit, true) }}"