From 173eb54b273e8a62271e541a7ab5e18dd0ede6d2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 30 Apr 2019 12:29:16 -0700 Subject: [PATCH 1/9] MediaWiki 1.32.0 -> MediaWiki 1.32.1 --- roles/mediawiki/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mediawiki/defaults/main.yml b/roles/mediawiki/defaults/main.yml index 975f9f219..08caf1a6d 100644 --- a/roles/mediawiki/defaults/main.yml +++ b/roles/mediawiki/defaults/main.yml @@ -5,7 +5,7 @@ # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! mediawiki_major_version: "1.32" -mediawiki_minor_version: "0" +mediawiki_minor_version: "1" mediawiki_version: "{{ mediawiki_major_version }}.{{ mediawiki_minor_version }}" mediawiki_download_base_url: "https://releases.wikimedia.org/mediawiki/{{ mediawiki_major_version }}" From 6d66269437e23341697661cab3e4199c42aad1e5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 1 May 2019 20:48:40 -0400 Subject: [PATCH 2/9] disable Calibre-Web in MEDIUM...until #1624 is fixed --- vars/local_vars_medium.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index e2fec51ca..9449bedbc 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -296,8 +296,8 @@ calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 # program, so we recommend you also install Calibre (above!) # Calibre-Web alternative to Calibre, offers a clean/modern UX -calibreweb_install: True -calibreweb_enabled: True +calibreweb_install: False +calibreweb_enabled: False calibreweb_port: 8083 # PORT VARIABLE HAS NO EFFECT (as of January 2019) # http://box/books works. Add {box/libros, box/livres, box/livros, box/liv} etc? calibreweb_url: /books From 40ac1a6bf42d6b26ff1d4a307589bcbaf2cfeef8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 1 May 2019 20:49:14 -0400 Subject: [PATCH 3/9] disable Calibre-Web in BIG...until #1624 is fixed --- vars/local_vars_big.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index ea754c47d..3ae4f871f 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -296,8 +296,8 @@ calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 # program, so we recommend you also install Calibre (above!) # Calibre-Web alternative to Calibre, offers a clean/modern UX -calibreweb_install: True -calibreweb_enabled: True +calibreweb_install: False +calibreweb_enabled: False calibreweb_port: 8083 # PORT VARIABLE HAS NO EFFECT (as of January 2019) # http://box/books works. Add {box/libros, box/livres, box/livros, box/liv} etc? calibreweb_url: /books From 161ed6f99f472b9e746768013e8f6aacda7809a7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 2 May 2019 05:58:30 -0700 Subject: [PATCH 4/9] Lokole 0.1.39 -> 0.1.41 --- roles/lokole/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/lokole/defaults/main.yml b/roles/lokole/defaults/main.yml index 02e245d81..0fdda9872 100644 --- a/roles/lokole/defaults/main.yml +++ b/roles/lokole/defaults/main.yml @@ -5,7 +5,7 @@ # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! # Info needed to install Lokole -lokole_version: "0.1.39" +lokole_version: 0.1.41 lokole_admin_user: admin # lowercase seems nec here (even though uppercase Admin/changeme is IIAB's OOB recommendation!) lokole_admin_password: changeme lokole_install_path: "{{ content_base }}/lokole" # /library/lokole From 0682b03931f30360bd0a59dd51705b07c176f353 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 3 May 2019 23:51:06 -0400 Subject: [PATCH 5/9] run netplan.yml if Ubuntu 18.04 or higher --- roles/network/tasks/main.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 1d8101a7e..5f2fa02a5 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -100,42 +100,43 @@ - name: Redhat networking include_tasks: ifcfg_mods.yml when: is_redhat -#and not installing + #and not installing tags: - network -- name: Netplan in use on Ubuntu 18 +- name: Netplan in use on Ubuntu 18.04+ include_tasks: netplan.yml - when: is_ubuntu_18 -#and not installing + when: is_ubuntu and not is_ubuntu_16 + #when: is_ubuntu_18 + #and not installing tags: - network - name: NetworkManager in use include_tasks: NM-debian.yml when: is_debuntu and network_manager_active -#and not installing + #and not installing tags: - network - name: systemd-networkd in use include_tasks: sysd-netd-debian.yml when: is_debuntu and systemd_networkd_active -#and not installing + #and not installing tags: - network - name: RPi's have dhcpcd in use include_tasks: rpi_debian.yml when: is_debuntu and is_rpi -#and not installing + #and not installing tags: - network - name: Not RPi, Not NetworkManager, Not systemd-networkd in use include_tasks: debian.yml when: (not is_rpi and not network_manager_active and not systemd_networkd_active and is_debuntu) or is_ubuntu_16 -#and not installing + #and not installing tags: - network From 63ab350994087e008122028cc15b952cf2714ba6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 4 May 2019 00:54:27 -0400 Subject: [PATCH 6/9] Comments tightened up --- roles/network/tasks/netplan.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/network/tasks/netplan.yml b/roles/network/tasks/netplan.yml index 9f5d8837f..c149d9426 100644 --- a/roles/network/tasks/netplan.yml +++ b/roles/network/tasks/netplan.yml @@ -1,5 +1,4 @@ -# netplan.yml -- name: Figure out netplan file name on Ubuntu 18 +- name: Figure out netplan file name shell: ls /etc/netplan register: netplan From 98f682a0e4d88a23e32c392533c7f0e17ec17e26 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 4 May 2019 00:57:44 -0400 Subject: [PATCH 7/9] Ansible file module "path" is equiv to "dest" --- roles/network/tasks/netplan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/netplan.yml b/roles/network/tasks/netplan.yml index c149d9426..b9fd2bd40 100644 --- a/roles/network/tasks/netplan.yml +++ b/roles/network/tasks/netplan.yml @@ -11,7 +11,7 @@ - name: Remove stock netplan template file: state: absent - dest: /etc/netplan/{{ item }} + path: /etc/netplan/{{ item }} with_items: - "{{ netplan.stdout_lines }}" when: netplan.stdout.find("yaml") != -1 From bd6d454b6422dfd26fe51a3db37109a8ab7c0c11 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 4 May 2019 03:14:49 -0400 Subject: [PATCH 8/9] "optional: true" eliminates 2+ min stall during boot of Ubuntu 19.04 (#1586) --- roles/network/templates/network/netplan.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/network/templates/network/netplan.j2 b/roles/network/templates/network/netplan.j2 index 8cac0d475..f0fd171f8 100644 --- a/roles/network/templates/network/netplan.j2 +++ b/roles/network/templates/network/netplan.j2 @@ -16,7 +16,9 @@ network: search: [{{ iiab_domain }}] {% else %} dhcp4: yes + optional: true {% endif %} + #{% if iiab_lan_iface == "br0" %} # bridges: # # the key name is the name for virtual (created) interfaces From 48081487c131abb23480b1cb60583b4165073e55 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 4 May 2019 03:40:12 -0400 Subject: [PATCH 9/9] Explain /opt/iiab/iiab/vars/.yml in context --- vars/default_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index a9d58fbf7..4d151133c 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -567,5 +567,5 @@ is_fedora_18: False # How This Works: # 1. /opt/iiab/iiab/iiab-install copies scripts/local_facts.fact to /etc/ansible/facts.d/local_facts.fact # 2. Ansible runs /etc/ansible/facts.d/local_facts.fact to identify the OS -# 3. ./iiab-install (iiab-stages.yml) or ./runrole (run-one-role.yml) or Admin Console (iiab-from-console.yml) invoke the correct /opt/iiab/iiab/vars/.yml +# 3. Within /opt/iiab/iiab, ./iiab-install (iiab-stages.yml) or ./runrole (run-one-role.yml) or Admin Console (iiab-from-console.yml) invoke the correct /opt/iiab/iiab/vars/.yml # Longer Explanation: https://github.com/iiab/iiab/wiki/IIAB-Variables (Order of Execution and Precedence)