Merge pull request #280 from iiab/master

sync from iiab/iiab

roles/gitea/defaults/main.yml

@@ -8,7 +8,7 @@
 # https://git.coolaj86.com/coolaj86/gitea-installer.sh
 
 # Information needed to install Gitea
-gitea_version: 1.9.0
+gitea_version: 1.9.2
 iset_suffixes:
   i386: 386
   x86_64: amd64

roles/internetarchive/tasks/main.yml

@@ -19,8 +19,8 @@
     owner: "root"
 
 - name: Run yarn install to get needed modules (CAN TAKE ~15 MINUTES)
-  command: sudo yarn add @internetarchive/dweb-archive @internetarchive/dweb-mirror
+  command: yarn add @internetarchive/dweb-archive @internetarchive/dweb-mirror
-  #command: yarn add @internetarchive/dweb-archive @internetarchive/dweb-mirror
+  #command: sudo yarn add @internetarchive/dweb-archive @internetarchive/dweb-mirror
   #become: yes    # Escalate to root, similar to 'sudo'
   args:
     chdir: "{{ internetarchive_dir }}"
@@ -74,9 +74,9 @@
     daemon_reload: yes
     state: stopped
 
-- name: 'Update pre-existing install: sudo yarn upgrade'
+- name: 'Update pre-existing install: yarn upgrade'
-  command: sudo yarn upgrade
+  command: yarn upgrade
-  #command: yarn upgrade
+  #command: sudo yarn upgrade
   #become: yes    # Escalate to root, similar to 'sudo'
   args:
     chdir: "{{ internetarchive_dir }}"

roles/network/tasks/hostapd.yml

@@ -1,3 +1,8 @@
+- name: Turn off hostapd when no wifi interface present or in "Appliance Mode"
+  set_fact:
+    hostapd_enabled: False
+  when: not iiab_wireless_lan_iface is defined or iiab_network_mode == "Appliance"
+
 - name: Create /etc/hostapd/hostapd.conf from template
   template:
     src: hostapd/hostapd.conf.j2
@@ -5,16 +10,16 @@
     owner: root
     group: root
     mode: 0644
-  when: iiab_wireless_lan_iface is defined
+  when: discovered_wireless_iface != "none"
 
-- name: Create /etc/hostapd/hostapd.conf.iiab from template
+- name: Create backup /etc/hostapd/hostapd.conf.iiab from template
   template:
     src: hostapd/iiab-hostapd.conf.j2
     dest: /etc/hostapd/hostapd.conf.iiab
     owner: root
     group: root
     mode: 0644
-  when: discovered_wireless_iface is defined
+  when: discovered_wireless_iface != "none"
 
 - name: Use custom systemd unit file to start 'hostapd' service
   template:
@@ -23,6 +28,7 @@
     owner: root
     group: root
     mode: 0644
+  when: discovered_wireless_iface != "none"
 
 - name: Create /usr/bin/iiab-hotspot-on from template
   template:
@@ -53,7 +59,7 @@
   systemd:
     name: hostapd
     enabled: yes
-  when: hostapd_enabled and iiab_wireless_lan_iface is defined and iiab_network_mode != "Appliance"
+  when: hostapd_enabled
 
 - name: Record HOSTAPD_ENABLED to {{ iiab_env_file }}
   lineinfile:

roles/yarn/tasks/main.yml

@@ -17,6 +17,10 @@
     line: 'deb http://dl.yarnpkg.com/debian/ stable main'
     state: present
 
+- name: "Yarn | Update APT cache"	
+  apt:	
+    update_cache: yes
+
 - name: "Yarn | Install"
   package:
     name: yarn

scripts/ansible

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 CURR_VER="undefined"    # Ansible version you currently have installed
-GOOD_VER="2.8.3"    # For XO laptops (pip install) & CentOS (yum install rpm)
+GOOD_VER="2.8.4"    # For XO laptops (pip install) & CentOS (yum install rpm)
 # On other OS's we attempt the latest from PPA, which might be more recent
 
 export DEBIAN_FRONTEND=noninteractive

scripts/ansible-2.7.x

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 CURR_VER="undefined"    # Ansible version you currently have installed
-GOOD_VER="2.7.12"    # For XO laptops (pip install) & CentOS (yum install rpm)
+GOOD_VER="2.7.13"    # For XO laptops (pip install) & CentOS (yum install rpm)
 # On other OS's we attempt the latest from PPA, which might be more recent
 
 export DEBIAN_FRONTEND=noninteractive

scripts/ansible-2.8.x

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 CURR_VER="undefined"    # Ansible version you currently have installed
-GOOD_VER="2.8.3"    # For XO laptops (pip install) & CentOS (yum install rpm)
+GOOD_VER="2.8.4"    # For XO laptops (pip install) & CentOS (yum install rpm)
 # On other OS's we attempt the latest from PPA, which might be more recent
 
 export DEBIAN_FRONTEND=noninteractive