external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #399 from iiab/master

Browse source 
sync from iiab:master
This commit is contained in:
A Holt 2020-05-12 23:10:12 -04:00 • committed by GitHub
commit 93a64fc1f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/network/templates/hostapd/test-wifi
View file

@ -15,6 +15,10 @@ fi
# covers raspbian # covers raspbian
if [ -f /etc/wpa_supplicant/wpa_supplicant.conf ]; then if [ -f /etc/wpa_supplicant/wpa_supplicant.conf ]; then
RASPBIAN=1 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/\"//` SSID=`grep ssid /etc/wpa_supplicant/wpa_supplicant.conf | awk -F = '{print $2}' | sed -r s/\"// | sed -r s/\"//`
fi fi

2
roles/network/templates/network/dnsmasq-iiab
View file

@ -1,7 +1,7 @@
#IIAB #IIAB
bind-interfaces bind-interfaces
# Wan nameserver if manually set # Wan nameserver if manually set
{% if wan_nameserver != "" %} {% if wan_nameserver is not none %}
no-resolv no-resolv
server={{ wan_nameserver }} server={{ wan_nameserver }}
{% endif %} {% endif %}

2
roles/nextcloud/templates/nextcloud-nginx.conf.j2
View file

@ -135,7 +135,7 @@ location ^~ {{ nextcloud_url }} {
access_log off; 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; try_files $uri /nextcloud/index.php$request_uri;
# Optional: Don't log access to other assets # Optional: Don't log access to other assets
access_log off; access_log off;