From 583dbfd0b9cd83b9992676d2a609df7d41168fe8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 6 Oct 2019 20:16:31 -0400 Subject: [PATCH 1/5] move Calibre & Calibre-Web to very end! --- vars/default_vars.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 985e72293..6f82ca01c 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -493,6 +493,20 @@ vnstat_enabled: True # 9-LOCAL-ADDONS +# Internet Archive Decentralized Web - create your own offline version box:4244 +# (or http://box/archive) arising from digital library https://dweb.archive.org +internetarchive_install: False +internetarchive_enabled: False +internetarchive_port: 4244 # for http://box:4244 + +# Minetest is an open source clone of the Minecraft building blocks game +minetest_install: False +minetest_enabled: False +minetest_port: 30000 +minetest_server_admin: Admin +minetest_default_game: carbone-ng # only carbone-ng and minetest are supported +minetest_flat_world: False + # Calibre E-Book Library # WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL # ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. @@ -523,20 +537,6 @@ calibreweb_url2: /libros # For SHORT URL http://box/libros (Spanish) calibreweb_url3: /livres # For SHORT URL http://box/livres (French) calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web -# Internet Archive Decentralized Web - create your own offline version box:4244 -# (or http://box/archive) arising from digital library https://dweb.archive.org -internetarchive_install: False -internetarchive_enabled: False -internetarchive_port: 4244 # for http://box:4244 - -# Minetest is an open source clone of the Minecraft building blocks game -minetest_install: False -minetest_enabled: False -minetest_port: 30000 -minetest_server_admin: Admin -minetest_default_game: carbone-ng # only carbone-ng and minetest are supported -minetest_flat_world: False - # ============================================================================= # UNMAINTAINED LEGACY VARIABLES: YOU'RE TAKING BIG RISKS IF YOU USE ANY HERE... From a35861d2952eeb276e237fdfdec2731a08fa6af1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 6 Oct 2019 20:22:05 -0400 Subject: [PATCH 2/5] move Calibre & Calibre-Web to very end! --- vars/local_vars_min.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 87204f364..65371faff 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -326,6 +326,15 @@ vnstat_enabled: True # 9-LOCAL-ADDONS +# Internet Archive Decentralized Web - create your own offline version box:4244 +# (or http://box/archive) arising from digital library https://dweb.archive.org +internetarchive_install: False +internetarchive_enabled: False + +# Minetest is an open source clone of the Minecraft building blocks game +minetest_install: False +minetest_enabled: False + # Calibre E-Book Library # WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL # ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. @@ -350,15 +359,6 @@ calibreweb_url2: /libros # For SHORT URL http://box/libros (Spanish) calibreweb_url3: /livres # For SHORT URL http://box/livres (French) calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web -# Internet Archive Decentralized Web - create your own offline version box:4244 -# (or http://box/archive) arising from digital library https://dweb.archive.org -internetarchive_install: False -internetarchive_enabled: False - -# Minetest is an open source clone of the Minecraft building blocks game -minetest_install: False -minetest_enabled: False - # CONSIDER THESE NEW OPENSTREETMAP (OSM) APPROACHES INSTEAD: # From b7373af9c3cc98549596d26f03b5af70089d37fd Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 6 Oct 2019 20:22:49 -0400 Subject: [PATCH 3/5] move Calibre & Calibre-Web to very end! --- vars/local_vars_medium.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 0c51e2cf0..86af15027 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -326,6 +326,15 @@ vnstat_enabled: True # 9-LOCAL-ADDONS +# Internet Archive Decentralized Web - create your own offline version box:4244 +# (or http://box/archive) arising from digital library https://dweb.archive.org +internetarchive_install: False +internetarchive_enabled: False + +# Minetest is an open source clone of the Minecraft building blocks game +minetest_install: False +minetest_enabled: False + # Calibre E-Book Library # WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL # ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. @@ -350,15 +359,6 @@ calibreweb_url2: /libros # For SHORT URL http://box/libros (Spanish) calibreweb_url3: /livres # For SHORT URL http://box/livres (French) calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web -# Internet Archive Decentralized Web - create your own offline version box:4244 -# (or http://box/archive) arising from digital library https://dweb.archive.org -internetarchive_install: False -internetarchive_enabled: False - -# Minetest is an open source clone of the Minecraft building blocks game -minetest_install: False -minetest_enabled: False - # CONSIDER THESE NEW OPENSTREETMAP (OSM) APPROACHES INSTEAD: # From ca54d6d52f87da9c059e4bf9092a25d1a70ad085 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 6 Oct 2019 20:23:18 -0400 Subject: [PATCH 4/5] move Calibre & Calibre-Web to very end! --- vars/local_vars_big.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index a6cb5c11f..8f316cf40 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -326,6 +326,15 @@ vnstat_enabled: True # 9-LOCAL-ADDONS +# Internet Archive Decentralized Web - create your own offline version box:4244 +# (or http://box/archive) arising from digital library https://dweb.archive.org +internetarchive_install: True +internetarchive_enabled: True + +# Minetest is an open source clone of the Minecraft building blocks game +minetest_install: True +minetest_enabled: True + # Calibre E-Book Library # WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL # ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. @@ -350,15 +359,6 @@ calibreweb_url2: /libros # For SHORT URL http://box/libros (Spanish) calibreweb_url3: /livres # For SHORT URL http://box/livres (French) calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web -# Internet Archive Decentralized Web - create your own offline version box:4244 -# (or http://box/archive) arising from digital library https://dweb.archive.org -internetarchive_install: True -internetarchive_enabled: True - -# Minetest is an open source clone of the Minecraft building blocks game -minetest_install: True -minetest_enabled: True - # CONSIDER THESE NEW OPENSTREETMAP (OSM) APPROACHES INSTEAD: # From 3dbe2e108e597df4b3483e80eaca5d5d87ee35f2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 6 Oct 2019 20:29:35 -0400 Subject: [PATCH 5/5] move Calibre & Calibre-Web to very end! --- roles/9-local-addons/tasks/main.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml index 086671c53..aabadd163 100644 --- a/roles/9-local-addons/tasks/main.yml +++ b/roles/9-local-addons/tasks/main.yml @@ -3,18 +3,6 @@ - name: ...IS BEGINNING ==================================== command: echo -- name: CALIBRE - include_role: - name: calibre - when: calibre_install | bool - tags: calibre - -- name: CALIBRE-WEB - include_role: - name: calibre-web - when: calibreweb_install | bool - tags: calibre-web - - name: INTERNETARCHIVE include_role: name: internetarchive @@ -27,6 +15,19 @@ when: minetest_install | bool tags: minetest +# KEEP AT THE END as this installs dependencies from Debian's 'testing' branch! +- name: CALIBRE + include_role: + name: calibre + when: calibre_install | bool + tags: calibre + +- name: CALIBRE-WEB + include_role: + name: calibre-web + when: calibreweb_install | bool + tags: calibre-web + - name: Recording STAGE 9 HAS COMPLETED ==================== lineinfile: dest: "{{ iiab_env_file }}"