yanistye/podkop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: second proxy configuration fixing

Browse Source
This commit is contained in:
Ivan Kvashonkin
2024-11-10 18:39:14 +03:00
parent 56e93a3d5f
commit d8a860fb2f
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js
View File

@@ -311,7 +311,7 @@ return view.extend({
o.depends('second_enable', '1'); o.depends('second_enable', '1');
o.ucisection = 'second'; // Changed to 'second' o.ucisection = 'second'; // Changed to 'second'
o = s.taboption('second_settings', form.Value, 'second_proxy_string', _('Proxy Configuration URL'), _('Enter connection string starting with vless:// or ss:// for proxy configuration')); o = s.taboption('second_settings', form.TextValue, 'second_proxy_string', _('Proxy Configuration URL'), _('Enter connection string starting with vless:// or ss:// for proxy configuration'));
o.depends('second_mode', 'proxy'); o.depends('second_mode', 'proxy');
o.ucisection = 'second'; // Changed to 'second' o.ucisection = 'second'; // Changed to 'second'

18
podkop/files/etc/init.d/podkop
View File

@@ -315,13 +315,12 @@ list_update() {
/etc/init.d/dnsmasq restart /etc/init.d/dnsmasq restart
fi fi
config_get_bool custom_domains_list_enabled "second" "custom_domains_list_enabled" "0" config_get_bool second_custom_domains_list_enabled "second" "second_custom_domains_list_enabled" "0"
if [ "$custom_domains_list_enabled" -eq 1 ]; then if [ "$second_custom_domains_list_enabled" -eq 1 ]; then
log "Adding a custom domains list. Second podkop" log "Adding a custom domains list. Second podkop"
add_set "podkop2_domains" "second" add_set "podkop2_domains" "second"
rm -f /tmp/dnsmasq.d/podkop2-custom-domains.lst rm -f /tmp/dnsmasq.d/podkop2-custom-domains.lst
config_list_foreach second custom_domains "list_delist_domains" config_list_foreach second second_custom_domains "list_custom_domains_create" "podkop2"
config_list_foreach second custom_domains "list_custom_domains_create" "podkop2"
dnsmasq_config_check podkop2-custom-domains.lst dnsmasq_config_check podkop2-custom-domains.lst
fi fi
@@ -331,11 +330,11 @@ list_update() {
add_set "podkop2_domains" "second" add_set "podkop2_domains" "second"
config_get service_list second "service_list" config_get service_list second "service_list"
lists_services_download "$service_list" lists_services_download "$service_list"
config_list_foreach second custom_domains "list_delist_domains" config_list_foreach second second_custom_domains "list_delist_domains"
dnsmasq_config_check podkop2-domains.lst dnsmasq_config_check podkop2-domains.lst
fi fi
if [ "$custom_domains_list_enabled" -eq 1 ] || [ "$domain_service_enabled" -eq 1 ]; then if [ "$second_custom_domains_list_enabled" -eq 1 ] || [ "$domain_service_enabled" -eq 1 ]; then
/etc/init.d/dnsmasq restart /etc/init.d/dnsmasq restart
fi fi
@@ -362,11 +361,11 @@ list_update() {
config_list_foreach main custom_subnets "list_custom_subnets_create" "podkop" config_list_foreach main custom_subnets "list_custom_subnets_create" "podkop"
fi fi
config_get_bool custom_subnets_list_enabled "second" "custom_subnets_list_enabled" "0" config_get_bool second_custom_subnets_list_enabled "second" "second_custom_subnets_list_enabled" "0"
if [ "$custom_subnets_list_enabled" -eq 1 ]; then if [ "$second_custom_subnets_list_enabled" -eq 1 ]; then
log "Adding a custom subnets list. Second" log "Adding a custom subnets list. Second"
add_set "podkop2_subnets" "second" add_set "podkop2_subnets" "second"
config_list_foreach second custom_subnets "list_custom_subnets_create" "podkop2" config_list_foreach second second_custom_subnets "list_custom_subnets_create" "podkop2"
fi fi
} }
@@ -852,7 +851,6 @@ sing_box_config_vless() {
end)' "$template_config" >/etc/sing-box/config.json end)' "$template_config" >/etc/sing-box/config.json
} }
# make one function for full and outbound only
sing_box_config_outbound_shadowsocks() { sing_box_config_outbound_shadowsocks() {
local STRING="$1" local STRING="$1"
local outbound="$2" local outbound="$2"