From 65295a100c07d1779da839b071643b82f122b22a Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 14 Jul 2023 22:30:01 -0400 Subject: [PATCH 1/3] Softcode calibreweb_repo_url in install.yml --- roles/calibre-web/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml index ebeefb6d7..17640c3ed 100644 --- a/roles/calibre-web/tasks/install.yml +++ b/roles/calibre-web/tasks/install.yml @@ -45,7 +45,7 @@ ## TODO: Calibre-web future release might get into pypi https://github.com/janeczku/calibre-web/issues/456 - name: Clone i.e. download Calibre-Web ({{ calibreweb_version }}) from https://github.com/janeczku/calibre-web.git to {{ calibreweb_venv_path }} (~94 MB initially, ~115+ MB later) git: - repo: https://github.com/janeczku/calibre-web.git + repo: "{{ calibreweb_repo_url }}" # e.g. https://github.com/janeczku/calibre-web dest: "{{ calibreweb_venv_path }}" force: yes depth: 1 From 8df3848b96319daaebf5c3c5d6a9b7bf403c7f6a Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 14 Jul 2023 22:31:51 -0400 Subject: [PATCH 2/3] Softcode calibreweb_repo_url in defaults/main.yml --- roles/calibre-web/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/calibre-web/defaults/main.yml b/roles/calibre-web/defaults/main.yml index 7abab0bd8..250deeaf6 100644 --- a/roles/calibre-web/defaults/main.yml +++ b/roles/calibre-web/defaults/main.yml @@ -14,6 +14,7 @@ # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! +calibreweb_repo_url: https://github.com/janeczku/calibre-web calibreweb_version: master # WAS: master, 0.6.4, 0.6.5, 0.6.6, 0.6.7, 0.6.8, 0.6.9 calibreweb_venv_path: /usr/local/calibre-web-py3 From 41f4617a4f70cdbf2d78291b7e120254d28fc6b1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 14 Jul 2023 22:42:16 -0400 Subject: [PATCH 3/3] calibre-web/tasks/install.yml: Mention 0.6.20 --- roles/calibre-web/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml index 17640c3ed..24f44d0f7 100644 --- a/roles/calibre-web/tasks/install.yml +++ b/roles/calibre-web/tasks/install.yml @@ -49,7 +49,7 @@ dest: "{{ calibreweb_venv_path }}" force: yes depth: 1 - version: "{{ calibreweb_version }}" # e.g. master, 0.6.17 + version: "{{ calibreweb_version }}" # e.g. master, 0.6.20 ## Ansible Pip Bug: Cannot use 'chdir' with 'env' https://github.com/ansible/ansible/issues/37912 (Patch landed) #- name: Download calibre-web dependencies into vendor subdirectory.