Merge branch 'master' into mitra

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

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 }}"

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
 

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
 
@@ -12,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

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

vars/default_vars.yml

@@ -571,5 +571,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/<OS>.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/<OS>.yml
 # Longer Explanation: https://github.com/iiab/iiab/wiki/IIAB-Variables (Order of Execution and Precedence)

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

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