external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 03:32:12 +00:00
Code Issues Releases Wiki Activity

Merge pull request #446 from iiab/master

Browse source 
Sync from iiab/iiab:master
This commit is contained in:
A Holt 2020-10-31 19:53:39 -04:00 committed by GitHub
commit 9998518fa4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 38 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roles/internetarchive/tasks/install.yml
View file

@ -9,10 +9,10 @@
include_role:
name: nodejs
- name: FAIL (STOP INSTALLING) IF nodejs_version is not set to 10.x or 12.x
- name: FAIL (STOP INSTALLING) IF nodejs_version is not set to 10.x, 12.x or 14.x
fail:
msg: "Internet Archive install cannot proceed, as it currently requires Node.js 10.x or 12.x, and your nodejs_version is set to {{ nodejs_version }}. Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml and possibly also /etc/iiab/local_vars.yml"
when: (nodejs_version != "10.x") and (nodejs_version != "12.x")
msg: "Internet Archive install cannot proceed, as it currently requires Node.js 10.x or 12.x or 14.x, and your nodejs_version is set to {{ nodejs_version }}. Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml and possibly also /etc/iiab/local_vars.yml"
when: (nodejs_version != "10.x") and (nodejs_version != "12.x") and (nodejs_version != "14.x")
- name: "Set 'yarn_install: True' and 'yarn_enabled: True'"
set_fact:

2
roles/network/tasks/NM-debian.yml
View file

@ -76,6 +76,6 @@
- name: Restart the NetworkManager service
systemd:
name: network-manager
name: NetworkManager
state: restarted
when: not nobridge is defined and not no_net_restart

2
roles/network/tasks/hostapd.yml
View file

@ -93,7 +93,7 @@
state: absent
when: is_raspbian and not wifi_up_down
- name: Create networkd-dispatcher diagnosic hook for recording network events
- name: Create networkd-dispatcher diagnostic hook for recording network events
template:
owner: root
group: root

2
roles/network/templates/hostapd/clone-wifi.service.j2
View file

@ -5,7 +5,7 @@ After=network-pre.target
Before=dhcpcd.service
Before=wpa_supplicant.service
Before=wpa_supplicant@{{ discovered_wireless_iface }}.service
Before=network-manager.service
Before=NetworkManager.service
Before=netplan-wpa@{{ discovered_wireless_iface }}.service
Before=hostapd.service

6
roles/network/templates/hostapd/hostapd.service.j2
View file

@ -5,9 +5,9 @@ After=network-pre.target
After=clone-wifi.service
Requires=clone-wifi.service
Before=dhcpcd.service
Before=wpa_supplicant@{{ discovered_wireless_iface }}.service
Before=network-manager.service
Before=netplan-wpa-{{ discovered_wireless_iface }}.service
Before=wpa_supplicant@{{ discovered_wireless_iface }}.service
Before=NetworkManager.service
Before=netplan-wpa-{{ discovered_wireless_iface }}.service
Before=network.target
[Service]

7
roles/network/templates/hostapd/wifi-test.service.j2
View file

@ -4,9 +4,9 @@ After=wpa_supplicant.service
Wants=wpa_supplicant.service
Before=hostapd.service
Before=dhcpcd.service
Before=wpa_supplicant@{{ discovered_wireless_iface }}.service
Before=network-manager.service
Before=netplan-wpa-{{ discovered_wireless_iface }}.service
Before=wpa_supplicant@{{ discovered_wireless_iface }}.service
Before=NetworkManager.service
Before=netplan-wpa-{{ discovered_wireless_iface }}.service
Before=network.target
[Service]
@ -16,4 +16,3 @@ ExecStart=/sbin/test-wifi
[Install]
WantedBy=multi-user.target

9
roles/nodered/tasks/install.yml
View file

@ -26,10 +26,11 @@
msg: "Node-RED install cannot proceed, as Node.js is not installed."
when: nodejs_installed is undefined
- name: FAIL (STOP THE INSTALL) IF 'nodejs_version != "12.x"'
fail:
msg: "Node-RED install cannot proceed, as it currently requires Node.js 12.x, whereas nodejs_version is set to {{ nodejs_version }}. Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml, /etc/iiab/local_vars.yml, /opt/iiab/iiab/roles/nodejs, etc."
when: nodejs_version != "12.x"
# 2020-10-29: not really be nec as Node-RED supports recent Node.js versions
#- name: FAIL (STOP THE INSTALL) IF 'nodejs_version != "12.x"'
# fail:
# msg: "Node-RED install cannot proceed, as it currently requires Node.js 12.x, whereas nodejs_version is set to {{ nodejs_version }}. Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml, /etc/iiab/local_vars.yml, /opt/iiab/iiab/roles/nodejs, etc."
# when: nodejs_version != "12.x"
# BRUTAL but ensures consistency across OS's / distros like Raspbian Desktop &

39
roles/postgresql/tasks/install.yml
View file

@ -68,32 +68,31 @@
group: postgres
mode: '0640'
# Likely No Longer Nec! Given stanza below does the same...
#- name: 'Stop postgresql service: /etc/init.d/postgresql stop (debuntu)'
# command: "/etc/init.d/postgresql stop"
# ignore_errors: True
# when: postgresql_install and is_debuntu
- name: Disable & Stop stock 'postgresql' systemd service
- name: Disable & Stop stock 'postgresql' (parent) systemd service
systemd:
name: postgresql
state: stopped
enabled: no
- name: Disable & Stop stock 'postgresql@11-main.service' systemd service - debian-10
systemd:
name: postgresql@11-main.service
state: stopped
enabled: no
# when: is_debian_10
when: is_debian_10 and not is_raspbian
# Above parent service postgresql.service uses template postgresql@.service to
# start/stop` child service e.g. postgresql@11-main.service on Debian 10, or
# postgresql@13-main.service on Debian 11. So these 2 stanzas dont do anything:
- name: Disable & Stop stock 'postgresql@' systemd service - debian-10
systemd:
name: postgresql@
enabled: no
# when: is_debian_10
when: is_debian_10 and not is_raspbian
# 'systemctl is-enabled postgresql@' shows 'indirect' before + after
#- name: Disable stock 'postgresql@' (template) if real Debian
# systemd:
# name: postgresql@
# #state: stopped # Error if you attempt to stop template
# enabled: no # Doesn't do anything
# when: is_debian and not is_raspbian
# 'systemctl is-enabled postgresql@13-main.service' shows 'enabled-runtime' before + after
#- name: Disable & Stop stock 'postgresql@{{ postgresql_version }}-main.service' (child service) if real Debian
# systemd:
# name: "postgresql@{{ postgresql_version }}-main.service"
# state: stopped # Already done by parent above
# enabled: no # Doesn't do anything
# when: is_debian and not is_raspbian
# RECORD PostgreSQL AS INSTALLED

2
run-one-role.yml
View file

@ -4,7 +4,7 @@
vars_files:
- vars/default_vars.yml
- "vars/{{ ansible_local.local_facts.os_ver }}.yml"
- vars/{{ ansible_local.local_facts.os_ver }}.yml
- /etc/iiab/local_vars.yml
- /etc/iiab/iiab_state.yml

2
vars/default_vars.yml
View file

@ -395,7 +395,7 @@ nodejs_install: False
nodejs_enabled: False
# Node.js version used by roles/nodejs/tasks/main.yml for 3 roles:
# nodered (Node-RED), pbx (Asterix, FreePBX) & sugarizer (Sugarizer)
nodejs_version: 12.x # was 8.x until 2019-02-02, was 10.x until 2019-12-21
nodejs_version: 14.x # was 8.x til 2019-02-02, 10.x til 2019-12-21, 12.x til 2020-10-29
# Flow-based visual programming for wiring together IoT hardware devices etc
nodered_install: False