diff --git a/roles/backup/tasks/main.yml b/roles/backup/tasks/main.yml index cb54730..347793e 100644 --- a/roles/backup/tasks/main.yml +++ b/roles/backup/tasks/main.yml @@ -47,7 +47,7 @@ copy: content: "{{ item.content }}" dest: /etc/backup/{{ item.type }}.d/default - mode: 0755 + mode: 0700 loop: - type: pre content: "{{ backup_pre_script }}" diff --git a/roles/consul/templates/consul.service.j2 b/roles/consul/templates/consul.service.j2 index dd2052e..79ac42f 100644 --- a/roles/consul/templates/consul.service.j2 +++ b/roles/consul/templates/consul.service.j2 @@ -6,6 +6,7 @@ After=network-online.target ConditionFileNotEmpty={{ consul_root_dir }}/etc/consul.hcl [Service] +Type=notify EnvironmentFile=-{{ consul_root_dir }}/etc/consul.env User={{ consul_user }} Group={{ consul_user }} diff --git a/roles/metabase/defaults/main.yml b/roles/metabase/defaults/main.yml index 0182dcd..fe764b9 100644 --- a/roles/metabase/defaults/main.yml +++ b/roles/metabase/defaults/main.yml @@ -1,15 +1,15 @@ --- # Version to deploy -metabase_version: 0.45.3 +metabase_version: 0.46.5 # URL to fetch the jar metabase_jar_url: https://downloads.metabase.com/v{{ metabase_version }}/metabase.jar # Expected sha256 of the jar -metabase_jar_sha256: b7eedcba1bf1bf8843f66608aa976ec206353fb13ad8acb10471f9fe35d56968 +metabase_jar_sha256: e45f01438da1ba7faa524ebf5f57524e58511970443eaf61d087c91c0efb38ec # When building from source metabase_archive_url: https://github.com/metabase/metabase/archive/refs/tags/v{{ metabase_version }}.tar.gz # Expected sha256 of the archive -metabase_archive_sha256: 7f2a608f78a1bf11301943637c1e8cda888b673a3d10d2c927b4d453c165e746 +metabase_archive_sha256: 1b887755da494cd9ee9d756d087d2e5e81acad326f1f1e15aa3fb888809e7597 # Should ansible handle upgrades ? If set to false, only the initial install (and the config) will be handled metabase_manage_upgrade: True diff --git a/roles/n8n/defaults/main.yml b/roles/n8n/defaults/main.yml index f2e9213..f08d13b 100644 --- a/roles/n8n/defaults/main.yml +++ b/roles/n8n/defaults/main.yml @@ -1,7 +1,7 @@ --- # Version to deploy -n8n_version: 0.230.3 +n8n_version: 0.233.1 # Root directory where n8n will be installed n8n_root_dir: /opt/n8n # User account under which n8n will run diff --git a/roles/squash_tm/tasks/install.yml b/roles/squash_tm/tasks/install.yml index c46c63f..02b1b4f 100644 --- a/roles/squash_tm/tasks/install.yml +++ b/roles/squash_tm/tasks/install.yml @@ -4,14 +4,6 @@ package: name={{ squashtm_packages }} tags: squashtm -- name: Detect exact JRE version - block: - - command: rpm -q java-11-openjdk - changed_when: False - register: squashtm_jre11_version - - set_fact: squashtm_jre11_version={{ squashtm_jre11_version.stdout | trim }} - tags: squashtm - - when: squashtm_install_mode != 'none' block: diff --git a/roles/squash_tm/templates/squash-tm.service.j2 b/roles/squash_tm/templates/squash-tm.service.j2 index 8c17870..943cc93 100644 --- a/roles/squash_tm/templates/squash-tm.service.j2 +++ b/roles/squash_tm/templates/squash-tm.service.j2 @@ -8,7 +8,7 @@ User={{ squashtm_user }} Group={{ squashtm_user }} WorkingDirectory={{ squashtm_root_dir }}/app EnvironmentFile={{ squashtm_root_dir }}/etc/env -ExecStart=/usr/lib/jvm/{{ squashtm_jre11_version }}/bin/java \ +ExecStart=/usr/lib/jvm/jre-11/bin/java \ -Xms128m -Xmx2048m -server \ -Duser.language=en \ -Djava.io.tmpdir=${TMP_DIR} \