From 761966a36173e49897a0454c672639fd49ce4bfe Mon Sep 17 00:00:00 2001 From: meaz Date: Thu, 8 Aug 2024 21:52:59 +0200 Subject: [PATCH 1/6] add lemmy_imagemagick_nosig var --- defaults/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index b8ade2f..f388eae 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -79,6 +79,9 @@ lemmy_pictrs_logfile_error: '/var/log/lemmy-pictrs_err.log' lemmy_imagemagick_deploy: 'true' # set it to true if you want to deploy imagemagick lemmy_imagemagick_source_dir: '/var/lib/imei' lemmy_imagemagick_version: '6.11.3' # 6.11.2 +### set the following to true if you want to use `imei.sh --no-sig-verify` +### instead of just `imei.sh`. It can help in some cases +lemmy_imagemagick_nosig: 'false' #Postgres postgresql_version: 16 From 92a66cfe3b59ac6fa7da80b2abc1b806b8a508bc Mon Sep 17 00:00:00 2001 From: meaz Date: Thu, 8 Aug 2024 21:53:43 +0200 Subject: [PATCH 2/6] stop services before running imagemagick + add lemmy_imagemagick_nosig fix when condition --- tasks/imagemagick.yml | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/tasks/imagemagick.yml b/tasks/imagemagick.yml index 0d7225d..731a8b4 100644 --- a/tasks/imagemagick.yml +++ b/tasks/imagemagick.yml @@ -1,5 +1,35 @@ --- +- name: '[IMAGEMAGICK-RS] - Stop Backend systemd' + systemd: + name: lemmy + state: stopped + notify: + restart lemmy backend + tags: + - pictrs + - imagemagick + +- name: '[IMAGEMAGICK-RS] - Stop UI systemd' + systemd: + name: lemmy-ui + state: stopped + notify: + restart lemmy ui + tags: + - pictrs + - imagemagick + +- name: '[IMAGEMAGICK-RS] - Stop Pict-rs systemd' + systemd: + name: pictrs + state: stopped + notify: + restart pictrs + tags: + - pictrs + - imagemagick + - name: "[IMAGEMAGICK-RS] - Check what git tag we are at on server" shell: git describe --tags args: @@ -68,10 +98,10 @@ - imagemagick - name: '[IMAGEMAGICK] - Install ImageMagick with imei.sh script' - shell: '{{ lemmy_imagemagick_source_dir }}/imei.sh' + shell: "{{ lemmy_imagemagick_source_dir }}/imei.sh{{ ' --no-sig-verify' if lemmy_imagemagick_nosig == 'true' else '' }}" args: chdir: '{{ lemmy_imagemagick_source_dir }}' - when: tag_imagemagick_version.stdout != lemmy_imagemagick_version or "not found" in tag_imagemagick_installed.stderr + when: tag_imagemagick_version is defined and (tag_imagemagick_version.stdout != lemmy_imagemagick_version or "not found" in tag_imagemagick_version.stderr) tags: - pictrs - imagemagick From e2ff9712ff20e9887744000f835e11f94314843a Mon Sep 17 00:00:00 2001 From: meaz Date: Thu, 8 Aug 2024 21:56:02 +0200 Subject: [PATCH 3/6] stop services before updating or building pict-rs --- tasks/pict-rs.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tasks/pict-rs.yml b/tasks/pict-rs.yml index e8bdaf8..bd32562 100644 --- a/tasks/pict-rs.yml +++ b/tasks/pict-rs.yml @@ -1,5 +1,23 @@ --- +- name: '[IMAGEMAGICK-RS] - Stop Backend systemd' + systemd: + name: lemmy + state: stopped + notify: + restart lemmy backend + tags: + - pictrs + +- name: '[IMAGEMAGICK-RS] - Stop UI systemd' + systemd: + name: lemmy-ui + state: stopped + notify: + restart lemmy ui + tags: + - pictrs + - name: "[PICT-RS] - Check what git tag we are at on server" shell: git describe --tags args: From d0fc970af7711741feb9df7490d26743c4f0d511 Mon Sep 17 00:00:00 2001 From: meaz Date: Thu, 8 Aug 2024 22:00:57 +0200 Subject: [PATCH 4/6] fix error on when condition --- tasks/imagemagick.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/imagemagick.yml b/tasks/imagemagick.yml index 731a8b4..c8e621c 100644 --- a/tasks/imagemagick.yml +++ b/tasks/imagemagick.yml @@ -101,7 +101,7 @@ shell: "{{ lemmy_imagemagick_source_dir }}/imei.sh{{ ' --no-sig-verify' if lemmy_imagemagick_nosig == 'true' else '' }}" args: chdir: '{{ lemmy_imagemagick_source_dir }}' - when: tag_imagemagick_version is defined and (tag_imagemagick_version.stdout != lemmy_imagemagick_version or "not found" in tag_imagemagick_version.stderr) + when: tag_imagemagick_version is defined and (tag_imagemagick_version.stdout != lemmy_imagemagick_version or "not found" in tag_imagemagick_installed.stderr) tags: - pictrs - imagemagick From dc3262395bcf491c8b54614b0009e74dc21319dc Mon Sep 17 00:00:00 2001 From: meaz Date: Wed, 21 Aug 2024 22:14:16 +0200 Subject: [PATCH 5/6] put the space before the if statement --- tasks/imagemagick.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/imagemagick.yml b/tasks/imagemagick.yml index c8e621c..2bb5755 100644 --- a/tasks/imagemagick.yml +++ b/tasks/imagemagick.yml @@ -98,7 +98,7 @@ - imagemagick - name: '[IMAGEMAGICK] - Install ImageMagick with imei.sh script' - shell: "{{ lemmy_imagemagick_source_dir }}/imei.sh{{ ' --no-sig-verify' if lemmy_imagemagick_nosig == 'true' else '' }}" + shell: "{{ lemmy_imagemagick_source_dir }}/imei.sh {{ '--no-sig-verify' if lemmy_imagemagick_nosig == 'true' else '' }}" args: chdir: '{{ lemmy_imagemagick_source_dir }}' when: tag_imagemagick_version is defined and (tag_imagemagick_version.stdout != lemmy_imagemagick_version or "not found" in tag_imagemagick_installed.stderr) From 5cd9b1b44e6d40edf84801b454a779acf20649a5 Mon Sep 17 00:00:00 2001 From: meaz Date: Sat, 14 Dec 2024 10:04:40 +0100 Subject: [PATCH 6/6] Update to 0.19.8 --- defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index f388eae..bfc457b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -14,7 +14,7 @@ lemmy_logfile_error: '/var/log/lemmy_err.log' lemmy_app_dir: '/var/lib/lemmy' # Backend -lemmy_backend_version: '0.19.5' +lemmy_backend_version: '0.19.8' lemmy_backend_source_dir: '/var/lib/lemmy-git' lemmy_backend_dir: '{{ lemmy_app_dir }}/lemmy-server' @@ -50,7 +50,7 @@ nodejs_version: '20' lemmy_ui_pkg: - yarn -lemmy_ui_version: '0.19.5' +lemmy_ui_version: '0.19.8' lemmy_ui_dir: '/var/lib/lemmy/lemmy-ui' lemmy_ui_port: '1234' lemmy_ui_logfile: '/var/log/lemmy-ui.log'