Merge pull request #253 from iiab/master

sync from iiab/iiab

roles/2-common/tasks/packages.yml

@@ -33,7 +33,7 @@
     state: present
   when: is_debuntu | bool
 
-- name: "Install 22 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, rsync, sudo, tar, unzip, usbmount, usbutils, wget"
+- name: "Install 23 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, pastebinit, rsync, sudo, tar, unzip, usbmount, usbutils, wget"
   package:
     name:
       - acpid
@@ -54,6 +54,7 @@
       - ntfs-3g
       #- openssh-server    # ssh (Raspbian) or openssh-server (other OS's) already installed by 1-prep's roles/sshd/tasks/main.yml
       - pandoc
+      - pastebinit
       - rsync
       - sudo
       - tar

roles/kiwix/defaults/main.yml

@@ -10,9 +10,9 @@
 # Which kiwix-tools to download from http://download.iiab.io/packages/
 # As obtained from http://download.kiwix.org/release/kiwix-tools/ or http://download.kiwix.org/nightly/
 
-kiwix_version_armhf: "kiwix-tools_linux-armhf-1.2.1"
-kiwix_version_linux64: "kiwix-tools_linux-x86_64-1.2.1"
-kiwix_version_i686: "kiwix-tools_linux-i586-1.2.1"
+kiwix_version_armhf: "kiwix-tools_linux-armhf-2.0.0"
+kiwix_version_linux64: "kiwix-tools_linux-x86_64-2.0.0"
+kiwix_version_i686: "kiwix-tools_linux-i586-2.0.0"
 # kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2"
 # v0.9 for i686 published May 2014 ("use it to test legacy ZIM content")
 # v0.10 for i686 published Oct 2016 ("experimental") REPLACED IN EARLY 2018, thx to Matthieu Gautier:

roles/network/templates/network/iiab-hotspot-on

@@ -1,6 +1,8 @@
 #!/bin/bash
 cp -f /etc/hostapd/hostapd.conf.iiab /etc/hostapd/hostapd.conf
 sed -i -e "s/^#denyinterfaces/denyinterfaces/" /etc/dhcpcd.conf
+# shut down wlan0 in case connected to network
+ip link set wlan0 down
 systemctl enable hostapd
 #systemctl enable dnsmasq
 systemctl daemon-reload