diff --git a/roles/podman_link/defaults/main.yml b/roles/podman_link/defaults/main.yml index a7bdbe9..4fa74a9 100644 --- a/roles/podman_link/defaults/main.yml +++ b/roles/podman_link/defaults/main.yml @@ -1,6 +1,6 @@ # podman_link_podman_rootless_user: podman_link_web_hostname: "{{ inventory_hostname }}" -podman_link_stack_version: 3.4.2-beta.3 +podman_link_stack_version: 3.4.3-beta.4 podman_link_postgres_zammad_user: postgres podman_link_postgres_zammad_database: zammad_production podman_link_postgres_link_user: link diff --git a/roles/podman_link/tasks/main.yml b/roles/podman_link/tasks/main.yml index 98c1ddc..e13bd2e 100644 --- a/roles/podman_link/tasks/main.yml +++ b/roles/podman_link/tasks/main.yml @@ -29,8 +29,8 @@ - name: Podman CDR Link | AUDIT | Parse outputs of getsubids and store results ansible.builtin.set_fact: - _podman_link_user_subuid_start: "{{ (_podman_link_user_subuid.stdout_lines[0].split()[2] | int) }}" - _podman_link_user_subgid_start: "{{ (_podman_link_user_subgid.stdout_lines[0].split()[2] | int) }}" + _podman_link_user_subuid_start: "{{ _podman_link_user_subuid.stdout_lines[0].split()[2] }}" + _podman_link_user_subgid_start: "{{ _podman_link_user_subgid.stdout_lines[0].split()[2] }}" - name: Podman CDR Link | PATCH | Set sysctl vm.max_map_count for Opensearch tuning ansible.posix.sysctl: @@ -50,8 +50,8 @@ - name: Podman CDR Link | PATCH | Create data directory for Opensearch ansible.builtin.file: path: "/home/{{ podman_link_podman_rootless_user }}/opensearch-data" - owner: "{{ _podman_link_user_subuid_start + 999 }}" - group: "{{ _podman_link_user_subgid_start + 999 }}" + owner: "{{ (_podman_link_user_subuid_start | int) + 999 }}" + group: "{{ (_podman_link_user_subgid_start | int) + 999 }}" mode: "0700" state: "directory" become: true @@ -62,8 +62,8 @@ src: home/opensearch-config.yml dest: "/home/{{ podman_link_podman_rootless_user }}/opensearch-config.yml" mode: "0400" - owner: "{{ _podman_link_user_subuid_start + 999 }}" - group: "{{ _podman_link_user_subgid_start + 999 }}" + owner: "{{ (_podman_link_user_subuid_start | int) + 999 }}" + group: "{{ (_podman_link_user_subgid_start | int) + 999 }}" become: true notify: - Restart Link @@ -73,8 +73,8 @@ ansible.builtin.template: src: home/zammad-database.yml dest: "/home/{{ podman_link_podman_rootless_user }}/zammad-database.yml" - owner: "{{ _podman_link_user_subuid_start + 999 }}" - group: "{{ _podman_link_user_subuid_start + 999 }}" + owner: "{{ (_podman_link_user_subuid_start | int) + 999 }}" + group: "{{ (_podman_link_user_subuid_start | int) + 999 }}" mode: "0400" become: true notify: @@ -84,8 +84,8 @@ - name: Podman CDR Link | PATCH | Create data directories for Zammad ansible.builtin.file: path: "/home/{{ podman_link_podman_rootless_user }}/{{ item }}" - owner: "{{ _podman_link_user_subuid_start + 999 }}" - group: "{{ _podman_link_user_subgid_start + 999 }}" + owner: "{{ (_podman_link_user_subuid_start | int) + 999 }}" + group: "{{ (_podman_link_user_subgid_start | int) + 999 }}" mode: "0700" state: "directory" become: true @@ -101,8 +101,8 @@ - name: Podman CDR Link | PATCH | Create data directory for PostgreSQL and Redis ansible.builtin.file: path: "/home/{{ podman_link_podman_rootless_user }}/{{ item }}" - owner: "{{ _podman_link_user_subuid_start + 998 }}" - group: "{{ _podman_link_user_subgid_start + 998 }}" + owner: "{{ (_podman_link_user_subuid_start | int) + 998 }}" + group: "{{ (_podman_link_user_subgid_start | int) + 998 }}" mode: "0750" state: "directory" become: true @@ -147,8 +147,8 @@ - name: Podman CDR Link | PATCH | Create data directory for bridge-whatsapp ansible.builtin.file: path: "/home/{{ podman_link_podman_rootless_user }}/bridge-whatsapp-data" - owner: "{{ _podman_link_user_subuid_start + 999 }}" - group: "{{ _podman_link_user_subgid_start + 999 }}" + owner: "{{ (_podman_link_user_subuid_start | int) + 999 }}" + group: "{{ (_podman_link_user_subgid_start | int) + 999 }}" mode: "0700" state: "directory" become: true @@ -157,8 +157,8 @@ - name: Podman CDR Link | PATCH | Create data directory for signal-cli-rest-api ansible.builtin.file: path: "/home/{{ podman_link_podman_rootless_user }}/signal-cli-rest-api-data" - owner: "{{ _podman_link_user_subuid_start + 1001 }}" - group: "{{ _podman_link_user_subgid_start + 1001 }}" + owner: "{{ (_podman_link_user_subuid_start | int) + 1001 }}" + group: "{{ (_podman_link_user_subgid_start | int) + 1001 }}" mode: "0700" state: "directory" become: true diff --git a/roles/podman_seafile/tasks/main.yml b/roles/podman_seafile/tasks/main.yml index 1820676..af04664 100644 --- a/roles/podman_seafile/tasks/main.yml +++ b/roles/podman_seafile/tasks/main.yml @@ -29,15 +29,15 @@ - name: Podman Seafile | AUDIT | Parse outputs of getsubids and store results ansible.builtin.set_fact: - _podman_seafile_user_subuid_start: "{{ (_podman_seafile_user_subuid.stdout_lines[0].split()[2] | int) }}" - _podman_seafile_user_subgid_start: "{{ (_podman_seafile_user_subgid.stdout_lines[0].split()[2] | int) }}" + _podman_seafile_user_subuid_start: "{{ _podman_seafile_user_subuid.stdout_lines[0].split()[2] }}" + _podman_seafile_user_subgid_start: "{{ _podman_seafile_user_subgid.stdout_lines[0].split()[2] }}" # MySQL runs with UID/GID 999 inside the container - name: Podman Seafile | PATCH | Create data directory for MySQL ansible.builtin.file: path: "/home/{{ podman_seafile_podman_rootless_user }}/mysql_data" - owner: "{{ _podman_seafile_user_subuid_start + 998 }}" - group: "{{ _podman_seafile_user_subgid_start + 998 }}" + owner: "{{ (_podman_seafile_user_subuid_start | int) + 998 }}" + group: "{{ (_podman_seafile_user_subgid_start | int) + 998 }}" mode: "0750" state: "directory" become: true diff --git a/roles/podman_seafile/templates/home/podman/config/containers/systemd/onlyoffice.container b/roles/podman_seafile/templates/home/podman/config/containers/systemd/onlyoffice.container index c06285a..3b5462a 100644 --- a/roles/podman_seafile/templates/home/podman/config/containers/systemd/onlyoffice.container +++ b/roles/podman_seafile/templates/home/podman/config/containers/systemd/onlyoffice.container @@ -2,7 +2,7 @@ ContainerName=onlyoffice Environment=JWT_ENABLED=true Environment=JWT_SECRET={{ podman_seafile_jwt_private_key | replace("%", "%%") }} -Image=docker.io/onlyoffice/documentserver:8.1.0.1 +Image=docker.io/onlyoffice/documentserver:9.3.1 Network=frontend.network Volume=/home/{{ podman_seafile_podman_rootless_user }}/onlyoffice/logs:/var/log/onlyoffice:rw,Z Volume=/home/{{ podman_seafile_podman_rootless_user }}/onlyoffice/data:/var/www/onlyoffice/Data:rw,Z diff --git a/roles/podman_seafile/templates/home/podman/config/containers/systemd/redis.container b/roles/podman_seafile/templates/home/podman/config/containers/systemd/redis.container index de1d649..3426c2f 100644 --- a/roles/podman_seafile/templates/home/podman/config/containers/systemd/redis.container +++ b/roles/podman_seafile/templates/home/podman/config/containers/systemd/redis.container @@ -2,7 +2,7 @@ ContainerName=redis Environment=REDIS_PASSWORD={{ podman_seafile_redis_password | replace("%", "%%") }} Exec=/bin/sh -c 'redis-server --requirepass "$$REDIS_PASSWORD"' -Image=docker.io/redis +Image=docker.io/redis:latest Network=seafile.network [Service]