mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
[fix] Bash array not supported in ynh_render_template
This commit is contained in:
parent
c4f8c9e022
commit
321c8dd5ba
3 changed files with 7 additions and 6 deletions
|
@ -26,11 +26,11 @@ do_pre_regen() {
|
|||
ynh_validate_ip4 "$ipv4" || ipv4='127.0.0.1'
|
||||
ipv6=$(curl -s -6 https://ip6.yunohost.org 2>/dev/null || true)
|
||||
ynh_validate_ip6 "$ipv6" || ipv6=''
|
||||
IFS=' ' read -a interfaces <<< "$(ls /sys/class/net)"
|
||||
wireless_interfaces=()
|
||||
interfaces="$(ls /sys/class/net)"
|
||||
wireless_interfaces=""
|
||||
for dev in "${interfaces[@]}"; do
|
||||
if [ -d "/sys/class/net/$dev/wireless" ]; then
|
||||
wireless_interfaces+=("$dev")
|
||||
wireless_interfaces+=" $dev"
|
||||
fi
|
||||
done
|
||||
|
||||
|
|
|
@ -2,8 +2,8 @@ domain-needed
|
|||
expand-hosts
|
||||
localise-queries
|
||||
|
||||
|
||||
{% for interface in wireless_interfaces %}
|
||||
{% set interfaces = wireless_interfaces.strip().split(' ') %}
|
||||
{% for interface in interfaces %}
|
||||
interface={{ interface }}
|
||||
{% endfor %}
|
||||
resolv-file=/etc/resolv.dnsmasq.conf
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{% for interface in interfaces %}
|
||||
{% set interfaces_list = interfaces.split(' ') %}
|
||||
{% for interface in interfaces_list %}
|
||||
interface-name={{ domain }},{{ interface }}
|
||||
interface-name=xmpp-upload.{{ domain }},{{ interface }}
|
||||
{% endfor %}
|
||||
|
|
Loading…
Add table
Reference in a new issue