Merge pull request #491 from iiab/master

Sync from iiab/iiab:master

roles/lokole/defaults/main.yml

@@ -1,6 +1,8 @@
 # lokole_install: False
 # lokole_enabled: False
 
+# lokole_sim_type: LocalOnly    # lokole_sim_type: Ethernet
+
 # 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!
 

roles/munin/tasks/install.yml

@@ -5,7 +5,7 @@
       - munin-node
       - munin-plugins-extra
       - libcgi-fast-perl
-      - libapache2-mod-fcgid
+#      - libapache2-mod-fcgid
     state: present
   when: is_debuntu
 
@@ -17,10 +17,10 @@
     state: present
   when: not is_debuntu
 
-- name: 'Install from template: /etc/munin/munin.conf'
+#- name: 'Install from template: /etc/munin/munin.conf'
-  template:
+#  template:
-    src: munin.conf.j2
+#    src: munin.conf.j2
-    dest: /etc/munin/munin.conf
+#    dest: /etc/munin/munin.conf
 
 - name: 'Install from template: /etc/{{ apache_conf_dir }}/munin24.conf'
   template:

vars/default_vars.yml

@@ -389,6 +389,7 @@ jupyterhub_port: 8000
 # Lokole (email for rural communities) from https://ascoderu.ca
 lokole_install: False
 lokole_enabled: False
+lokole_sim_type: LocalOnly    # lokole_sim_type: Ethernet
 
 mediawiki_install: False
 mediawiki_enabled: False

vars/local_vars_big.yml

@@ -260,7 +260,7 @@ jupyterhub_enabled: True
 # Lokole (email for rural communities) from https://ascoderu.ca
 lokole_install: True
 lokole_enabled: True
-#lokole_sim_type: Ethernet
+lokole_sim_type: LocalOnly    # lokole_sim_type: Ethernet
 
 mediawiki_install: True
 mediawiki_enabled: True

vars/local_vars_medium.yml

@@ -260,7 +260,7 @@ jupyterhub_enabled: False
 # Lokole (email for rural communities) from https://ascoderu.ca
 lokole_install: False
 lokole_enabled: False
-#lokole_sim_type: Ethernet
+lokole_sim_type: LocalOnly    # lokole_sim_type: Ethernet
 
 mediawiki_install: False
 mediawiki_enabled: False

vars/local_vars_min.yml

@@ -260,7 +260,7 @@ jupyterhub_enabled: False
 # Lokole (email for rural communities) from https://ascoderu.ca
 lokole_install: False
 lokole_enabled: False
-#lokole_sim_type: Ethernet
+lokole_sim_type: LocalOnly    # lokole_sim_type: Ethernet
 
 mediawiki_install: False
 mediawiki_enabled: False

vars/raspbian-10.yml

@@ -26,6 +26,7 @@ sshd_service: ssh
 php_version: 7.3
 postgresql_version: 11
 systemd_location: /lib/systemd/system
+python_ver: 3.7
 
 # minetest for rpi
 minetest_server_bin: /library/games/minetest/bin/minetestserver