YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Bash array not supported in ynh_render_template

Browse source
This commit is contained in:
ljf 2021-11-26 18:42:22 +01:00
parent c4f8c9e022
commit 321c8dd5ba
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/hooks/conf_regen/43-dnsmasq
View file

@ -26,11 +26,11 @@ do_pre_regen() {
ynh_validate_ip4 "$ipv4" || ipv4='127.0.0.1' ynh_validate_ip4 "$ipv4" || ipv4='127.0.0.1'
ipv6=$(curl -s -6 https://ip6.yunohost.org 2>/dev/null || true) ipv6=$(curl -s -6 https://ip6.yunohost.org 2>/dev/null || true)
ynh_validate_ip6 "$ipv6" || ipv6='' ynh_validate_ip6 "$ipv6" || ipv6=''
IFS=' ' read -a interfaces <<< "$(ls /sys/class/net)" interfaces="$(ls /sys/class/net)"
wireless_interfaces=() wireless_interfaces=""
for dev in "${interfaces[@]}"; do for dev in "${interfaces[@]}"; do
if [ -d "/sys/class/net/$dev/wireless" ]; then if [ -d "/sys/class/net/$dev/wireless" ]; then
wireless_interfaces+=("$dev") wireless_interfaces+=" $dev"
fi fi
done done

4
data/templates/dnsmasq/dnsmasq.conf.tpl
View file

@ -2,8 +2,8 @@ domain-needed
expand-hosts expand-hosts
localise-queries localise-queries
{% set interfaces = wireless_interfaces.strip().split(' ') %}
{% for interface in wireless_interfaces %} {% for interface in interfaces %}
interface={{ interface }} interface={{ interface }}
{% endfor %} {% endfor %}
resolv-file=/etc/resolv.dnsmasq.conf resolv-file=/etc/resolv.dnsmasq.conf

3
data/templates/dnsmasq/domain.tpl
View file

@ -1,4 +1,5 @@
{% for interface in interfaces %} {% set interfaces_list = interfaces.split(' ') %}
{% for interface in interfaces_list %}
interface-name={{ domain }},{{ interface }} interface-name={{ domain }},{{ interface }}
interface-name=xmpp-upload.{{ domain }},{{ interface }} interface-name=xmpp-upload.{{ domain }},{{ interface }}
{% endfor %} {% endfor %}