Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions scripts/install
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,22 @@ source _common.sh
source /usr/share/yunohost/helpers

# Default values for config panel

config_file=""
cube_file=""
ovpn_file=""
nameservers=""
ip6_addr=""
ip6_net=""

ynh_app_setting_set --key="service_enabled" --value="0"
ynh_app_setting_set --key="config_file" --value=""
ynh_app_setting_set --key="cube_file" --value=""
ynh_app_setting_set --key="ovpn_file" --value=""
ynh_app_setting_set --key="config_file" --value="$config_file"
ynh_app_setting_set --key="cube_file" --value="$cube_file"
ynh_app_setting_set --key="ovpn_file" --value="$ovpn_file"
ynh_app_setting_set --key="dns_method" --value="yunohost"
ynh_app_setting_set --key="nameservers" --value=""
ynh_app_setting_set --key="ip6_addr" --value=""
ynh_app_setting_set --key="ip6_net" --value=""
ynh_app_setting_set --key="nameservers" --value="$nameservers"
ynh_app_setting_set --key="ip6_addr" --value="$ip6_addr"
ynh_app_setting_set --key="ip6_net" --value="$ip6_net"
ynh_app_setting_set --key="ip6_send_over_tun_enabled" --value="0"

#=================================================
Expand Down
19 changes: 14 additions & 5 deletions scripts/upgrade
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,21 @@ fi

# New stuff

ynh_app_setting_set_default --key="dns_method" --value="custom"
default_nameservers="$(grep -o -P '\s*nameserver\s+\K[abcdefabcdef\d.:]+' /etc/resolv.dnsmasq.conf | sort | uniq | paste -s -d, -)"
ynh_app_setting_set_default --key="nameservers" --value="$default_nameservers"
config_file=""
cube_file=""
ovpn_file=""
nameservers=""
ip6_addr=""
ip6_net=""

ynh_app_setting_set_default --key="service_enabled" --value="0"
ynh_app_setting_set_default --key="ip6_addr" --value=""
ynh_app_setting_set_default --key="ip6_net" --value=""
ynh_app_setting_set_default --key="config_file" --value="$config_file"
ynh_app_setting_set_default --key="cube_file" --value="$cube_file"
ynh_app_setting_set_default --key="ovpn_file" --value="$ovpn_file"
ynh_app_setting_set_default --key="dns_method" --value="yunohost"
ynh_app_setting_set_default --key="nameservers" --value="$nameservers"
ynh_app_setting_set_default --key="ip6_addr" --value="$ip6_addr"
ynh_app_setting_set_default --key="ip6_net" --value="$ip6_net"
ynh_app_setting_set_default --key="ip6_send_over_tun_enabled" --value="0"

#=================================================
Expand Down