mirror of
https://github.com/itdoginfo/podkop.git
synced 2025-12-06 11:36:50 +03:00
chore: restore start_main and stop_main; have reload call them instead of full start/stop
This commit is contained in:
@@ -104,7 +104,7 @@ has_outbound_section() {
|
|||||||
return $section_exists
|
return $section_exists
|
||||||
}
|
}
|
||||||
|
|
||||||
start() {
|
start_main() {
|
||||||
log "Starting podkop"
|
log "Starting podkop"
|
||||||
|
|
||||||
check_requirements
|
check_requirements
|
||||||
@@ -137,10 +137,6 @@ start() {
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
config_get_bool dont_touch_dhcp "settings" "dont_touch_dhcp" 0
|
|
||||||
if [ "$dont_touch_dhcp" -eq 0 ]; then
|
|
||||||
dnsmasq_configure
|
|
||||||
fi
|
|
||||||
uci_set "podkop" "settings" "shutdown_correctly" 0
|
uci_set "podkop" "settings" "shutdown_correctly" 0
|
||||||
uci commit "podkop" && config_load "$PODKOP_CONFIG"
|
uci commit "podkop" && config_load "$PODKOP_CONFIG"
|
||||||
|
|
||||||
@@ -149,7 +145,7 @@ start() {
|
|||||||
echo $! > /var/run/podkop_list_update.pid
|
echo $! > /var/run/podkop_list_update.pid
|
||||||
}
|
}
|
||||||
|
|
||||||
stop() {
|
stop_main() {
|
||||||
log "Stopping the podkop"
|
log "Stopping the podkop"
|
||||||
|
|
||||||
if [ -f /var/run/podkop_list_update.pid ]; then
|
if [ -f /var/run/podkop_list_update.pid ]; then
|
||||||
@@ -180,12 +176,6 @@ stop() {
|
|||||||
ip route flush table podkop
|
ip route flush table podkop
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local dont_touch_dhcp
|
|
||||||
config_get_bool dont_touch_dhcp "settings" "dont_touch_dhcp" 0
|
|
||||||
if [ "$dont_touch_dhcp" -eq 0 ]; then
|
|
||||||
dnsmasq_restore
|
|
||||||
fi
|
|
||||||
|
|
||||||
log "Stop sing-box"
|
log "Stop sing-box"
|
||||||
/etc/init.d/sing-box stop
|
/etc/init.d/sing-box stop
|
||||||
|
|
||||||
@@ -193,10 +183,27 @@ stop() {
|
|||||||
uci commit "podkop" && config_load "$PODKOP_CONFIG"
|
uci commit "podkop" && config_load "$PODKOP_CONFIG"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
start() {
|
||||||
|
start_main
|
||||||
|
config_get_bool dont_touch_dhcp "settings" "dont_touch_dhcp" 0
|
||||||
|
if [ "$dont_touch_dhcp" -eq 0 ]; then
|
||||||
|
dnsmasq_configure
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
stop() {
|
||||||
|
local dont_touch_dhcp
|
||||||
|
config_get_bool dont_touch_dhcp "settings" "dont_touch_dhcp" 0
|
||||||
|
if [ "$dont_touch_dhcp" -eq 0 ]; then
|
||||||
|
dnsmasq_restore
|
||||||
|
fi
|
||||||
|
stop_main
|
||||||
|
}
|
||||||
|
|
||||||
reload() {
|
reload() {
|
||||||
log "Podkop reload"
|
log "Podkop reload"
|
||||||
stop
|
stop_main
|
||||||
start
|
start_main
|
||||||
}
|
}
|
||||||
|
|
||||||
restart() {
|
restart() {
|
||||||
|
|||||||
Reference in New Issue
Block a user