From 754c521f0c4a67a16b162c4377983370a9a03fa2 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Mon, 11 May 2020 10:54:26 -0500 Subject: [PATCH 1/3] yaml set the variable wan_nameserver as 'null' without quotes then jinja converts that 'none' --- roles/network/templates/network/dnsmasq-iiab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/templates/network/dnsmasq-iiab b/roles/network/templates/network/dnsmasq-iiab index ecefeb359..ca3911e4f 100644 --- a/roles/network/templates/network/dnsmasq-iiab +++ b/roles/network/templates/network/dnsmasq-iiab @@ -1,7 +1,7 @@ #IIAB bind-interfaces # Wan nameserver if manually set -{% if wan_nameserver != "" %} +{% if wan_nameserver is not none %} no-resolv server={{ wan_nameserver }} {% endif %} From c1bf4adfc27d37b31c43b909e5ca3cfa53fc7ee0 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 12 May 2020 10:45:35 -0500 Subject: [PATCH 2/3] selective rfkill unblock for raspbian --- roles/network/templates/hostapd/test-wifi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/network/templates/hostapd/test-wifi b/roles/network/templates/hostapd/test-wifi index f1a1bc66c..32ff15601 100755 --- a/roles/network/templates/hostapd/test-wifi +++ b/roles/network/templates/hostapd/test-wifi @@ -15,6 +15,10 @@ fi # covers raspbian if [ -f /etc/wpa_supplicant/wpa_supplicant.conf ]; then RASPBIAN=1 + if /usr/sbin/rfkill list wifi | grep -q "Soft blocked: yes" ; then + echo "unblocking WiFi" + rfkill unblock wifi + fi SSID=`grep ssid /etc/wpa_supplicant/wpa_supplicant.conf | awk -F = '{print $2}' | sed -r s/\"// | sed -r s/\"//` fi From c230e321ee10125128af82588a164b7dce92eba3 Mon Sep 17 00:00:00 2001 From: Joshua Dennis Date: Tue, 12 May 2020 14:47:02 -0700 Subject: [PATCH 3/3] added video MIME support for Nextcloud/Nginx --- roles/nextcloud/templates/nextcloud-nginx.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nextcloud/templates/nextcloud-nginx.conf.j2 b/roles/nextcloud/templates/nextcloud-nginx.conf.j2 index 8723cb7e5..33575798d 100644 --- a/roles/nextcloud/templates/nextcloud-nginx.conf.j2 +++ b/roles/nextcloud/templates/nextcloud-nginx.conf.j2 @@ -135,7 +135,7 @@ location ^~ {{ nextcloud_url }} { access_log off; } - location ~ ^\/nextcloud\/.+[^\/]\.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ { + location ~ ^\/nextcloud\/.+[^\/]\.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$ { try_files $uri /nextcloud/index.php$request_uri; # Optional: Don't log access to other assets access_log off;