Merge pull request #210 from iiab/master

sync from iiab/iiab

roles/lokole/defaults/main.yml

@@ -1,5 +1,11 @@
+# lokole_install: False
+# lokole_enabled: False
+
+# 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!
+
 # Info needed to install Lokole
-lokole_version: "0.1.35"
+lokole_version: "0.1.36"
 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
@@ -9,15 +15,13 @@ lokole_venv: "{{ lokole_install_path }}/venv"       # /library/lokole/venv
 lokole_user: lokole
 lokole_run_directory: "/home/{{ lokole_user }}/state"
 
-lokole_install: True
-lokole_enabled: True
-
 lokole_url: /lokole
 lokole_full_url: "http://{{ iiab_hostname }}.{{ iiab_domain }}{{ lokole_url }}"    # http://box.lan/lokole
 
 lokole_domain_socket: "{{ lokole_run_directory }}/lokole_gunicorn.sock"
 
-# Global variables provided by setup-lokole.sh L157-166
-# https://github.com/ascoderu/opwen-webapp/blob/master/setup/setup-lokole.sh#L157
+# Global variables provided by setup-lokole.sh:
+# https://github.com/ascoderu/opwen-webapp/blob/master/setup/setup-lokole.sh#L140-L141
+# https://github.com/ascoderu/opwen-webapp/blob/master/setup/setup-lokole.sh#L182-L192
 opwen_server_locale: "{{ default_language }}"
 opwen_server_timezone: "{{ local_tz }}"

roles/network/templates/network/netplan.j2

@@ -12,10 +12,8 @@ network:
       - {{ wan_ip }}/{{ wan_cidr }}
       gateway4: {{ wan_gateway }}
       nameservers:
-        addresses:
-        - {{ wan_nameserver }}
-      search:
-      - {{ iiab_domain }}
+        addresses: [{{ wan_nameserver }}]
+        search: [{{ iiab_domain }}]
 {% else %}
       dhcp4: yes
 {% endif %}

vars/default_vars.yml

@@ -233,7 +233,7 @@ samba_enabled: False
 usb_lib_install: True
 usb_lib_enabled: True
 # Show entire contents of USB sticks/drives (at http://box/usb)
-iiab_usb_lib_show_all: False
+iiab_usb_lib_show_all: True
 
 # Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info)
 nodocs: False