From 6feda0834801898c0ebb5241e9227448e121cf3d Mon Sep 17 00:00:00 2001 From: StEn Date: Sat, 13 Jul 2024 11:29:39 +0200 Subject: [PATCH 1/6] add ubuntu 24 and 22 --- .github/workflows/code_testing.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code_testing.yml b/.github/workflows/code_testing.yml index db8ee1b..483e4c2 100644 --- a/.github/workflows/code_testing.yml +++ b/.github/workflows/code_testing.yml @@ -27,8 +27,9 @@ jobs: - debian11 - debian12 # https://github.com/geerlingguy/docker-ubuntu2204-ansible/issues/6 - # - ubuntu2204 - - ubuntu2004 + - ubuntu2204 + - ubuntu2404 + # - ubuntu2004 molecule_scenario: [ alternative_installation, check_fails, From 5e5e30056bf63ad9f4b5d51f865a2d71dd224e17 Mon Sep 17 00:00:00 2001 From: StEn Date: Wed, 11 Sep 2024 20:26:18 +0200 Subject: [PATCH 2/6] Remove mime-support from repo_packages.yml --- tasks/base_dependencies/repo_packages.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tasks/base_dependencies/repo_packages.yml b/tasks/base_dependencies/repo_packages.yml index 7e0134b..e727cde 100644 --- a/tasks/base_dependencies/repo_packages.yml +++ b/tasks/base_dependencies/repo_packages.yml @@ -21,7 +21,6 @@ - libpq-dev - libmagic-dev - mariadb-client - - mime-support - libzbar0 - poppler-utils - pkg-config From 4cd5d82c055c058b2adfec096a41e726dca6f725 Mon Sep 17 00:00:00 2001 From: StEn Date: Wed, 11 Sep 2024 20:40:35 +0200 Subject: [PATCH 3/6] Update ansible_version_minimum to "2.15" --- .github/workflows/code_testing.yml | 2 +- README.md | 2 +- vars/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/code_testing.yml b/.github/workflows/code_testing.yml index 483e4c2..c09e959 100644 --- a/.github/workflows/code_testing.yml +++ b/.github/workflows/code_testing.yml @@ -40,7 +40,7 @@ jobs: ] include: - molecule_scenario: default - ansible_version_minimum: "2.12" + ansible_version_minimum: "2.15" ansible_package_version_minimum: "5.0.1" name: Molecule Test diff --git a/README.md b/README.md index 0ce217e..f677fb6 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Installs and configures paperless-ngx EDMS. ### 1.1. Ansible -`ansible_version_minimum: "2.12"` or newer is required. +`ansible_version_minimum: "2.15"` or newer is required. The following Ansible collections need to be installed (via `ansible-galaxy collection install`) * community.general diff --git a/vars/main.yml b/vars/main.yml index e4dea8b..339206d 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,7 +1,7 @@ --- # Vars that shouldn't be altered by the user ## Vars without reference to the paperless-ngx docs -ansible_version_minimum: "2.12" +ansible_version_minimum: "2.15" ansible_required_collections: # [a-z_]+\.[a-z_]+(\.[a-z_]+)?: - community.general From 74845eff994066dd8fb4221166ee815e620eb2e6 Mon Sep 17 00:00:00 2001 From: StEn Date: Wed, 11 Sep 2024 20:45:49 +0200 Subject: [PATCH 4/6] Update min_ansible_version to "2.15" --- meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index 242f48d..3998b4a 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -11,7 +11,7 @@ galaxy_info: license: MIT - min_ansible_version: "2.12" + min_ansible_version: "2.15" platforms: - name: Debian From 1e91ad8c71376ba20a698f7c930d66a02c49dfb2 Mon Sep 17 00:00:00 2001 From: StEn Date: Wed, 11 Sep 2024 21:06:52 +0200 Subject: [PATCH 5/6] Update ansible_package_version_minimum to "8.0.0" --- .github/workflows/code_testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code_testing.yml b/.github/workflows/code_testing.yml index c09e959..e6a0d0f 100644 --- a/.github/workflows/code_testing.yml +++ b/.github/workflows/code_testing.yml @@ -41,7 +41,7 @@ jobs: include: - molecule_scenario: default ansible_version_minimum: "2.15" - ansible_package_version_minimum: "5.0.1" + ansible_package_version_minimum: "8.0.0" name: Molecule Test runs-on: ubuntu-latest From cda561adc8af73383d7e6e95fb9ff8afe78ce7b7 Mon Sep 17 00:00:00 2001 From: StEn Date: Thu, 12 Sep 2024 11:56:42 +0200 Subject: [PATCH 6/6] Update paperless_ngx_conf_usermap_uid and paperless_ngx_conf_usermap_gid in converge.yml in 2404 uid 1001 is already created by another program/service --- molecule/alternative_installation/converge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/molecule/alternative_installation/converge.yml b/molecule/alternative_installation/converge.yml index 44ea04b..8fb2874 100644 --- a/molecule/alternative_installation/converge.yml +++ b/molecule/alternative_installation/converge.yml @@ -11,8 +11,8 @@ - base_dependencies - paperless_ngx vars: - paperless_ngx_conf_usermap_uid: 1001 - paperless_ngx_conf_usermap_gid: 1001 + paperless_ngx_conf_usermap_uid: 9001 + paperless_ngx_conf_usermap_gid: 9001 paperless_ngx_conf_ocr_languages: [tur, ces] paperless_ngx_conf_enable_flower: true paperless_ngx_conf_port: 8001