Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from openwrt:master #19

Merged
merged 5 commits into from
Oct 24, 2024
Merged

[pull] master from openwrt:master #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
547557d
owut: update to 2024.10.15
efahl Oct 19, 2024
b37e625
netbird: update to 0.30.2
wehagy Oct 19, 2024
ea09236
keepalived: add option to override service running check
Francynox Oct 19, 2024
ac72a52
keepalived: fix ambigiuos functions in hotplug.sh
Francynox Oct 19, 2024
30f383c
keepalived: fix dnsmasq reload
Francynox Oct 19, 2024
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
2 changes: 1 addition & 1 deletion net/keepalived/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=keepalived
PKG_VERSION:=2.2.8
PKG_RELEASE:=7
PKG_RELEASE:=9

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.keepalived.org/software
Expand Down
1 change: 1 addition & 0 deletions net/keepalived/files/etc/hotplug.d/keepalived/511-firewall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

set_service_name firewall

set_skip_running_check
set_reload_if_sync

add_sync_file /etc/config/firewall
Expand Down
1 change: 0 additions & 1 deletion net/keepalived/files/etc/hotplug.d/keepalived/551-dnsmasq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ set_service_name dnsmasq

set_restart_if_master
set_stop_if_backup
set_reload_if_sync

add_sync_file /etc/config/dhcp
add_sync_file /tmp/dhcp.leases
Expand Down
36 changes: 26 additions & 10 deletions net/keepalived/files/lib/functions/keepalived/hotplug.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@ _service() {
[ ! -x "$rc" ] && return

case $1 in
start) $rc running || $rc start ;;
stop) $rc running && $rc stop ;;
start) _service_running_check "$rc" || $rc start ;;
stop) _service_running_check "$rc" && $rc stop ;;
reload)
if $rc running; then
if _service_running_check "$rc"; then
$rc reload
else
$rc start
fi
;;
restart)
if $rc running; then
if _service_running_check "$rc"; then
$rc restart
else
$rc start
Expand All @@ -50,6 +50,10 @@ _service() {
esac
}

_service_running_check() {
skip_running_check || "$1" running
}

_start_service() {
_service start
}
Expand Down Expand Up @@ -78,16 +82,16 @@ is_sync_file() {
list_contains SYNC_FILES_LIST "$1"
}

set_update_target() {
_set_update_target() {
set_var UPDATE_TARGET "${1:-1}"
}

get_update_target() {
get_var UPDATE_TARGET
}

unset_update_target() {
set_var UPDATE_TARGET
set_disable_update_target() {
_set_update_target 0
}

is_update_target() {
Expand Down Expand Up @@ -158,8 +162,20 @@ backup_and_stop() {
get_var_flag NOTIFY_BACKUP_STOP 1
}

set_skip_running_check() {
set_var NOTIFY_SKIP_RUNNING 1
}

skip_running_check() {
get_var_flag NOTIFY_SKIP_RUNNING
}

_set_reload_if_sync() {
set_var NOTIFY_SYNC_RELOAD "${1:-0}"
}

set_reload_if_sync() {
set_var NOTIFY_SYNC_RELOAD "${1:-1}"
_set_reload_if_sync 1
}

get_reload_if_sync() {
Expand Down Expand Up @@ -245,8 +261,8 @@ keepalived_hotplug() {
[ -z "$(get_fault_cb)" ] && set_fault_cb _notify_fault
[ -z "$(get_sync_cb)" ] && set_sync_cb _notify_sync

[ -z "$(get_update_target)" ] && set_update_target "$@"
[ -z "$(get_reload_if_sync)" ] && set_reload_if_sync "$@"
[ -z "$(get_update_target)" ] && _set_update_target "$@"
[ -z "$(get_reload_if_sync)" ] && _set_reload_if_sync "$@"

case $ACTION in
NOTIFY_MASTER) call_cb "$(get_master_cb)" ;;
Expand Down
4 changes: 2 additions & 2 deletions net/netbird/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=netbird
PKG_VERSION:=0.30.1
PKG_VERSION:=0.30.2
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/netbirdio/netbird/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=46014fb96e5320715efef5d1e767278e4f13dbe11eb18df7cdfb2bd06b12eabf
PKG_HASH:=4d27fed679da342b3f50c3aa5feda3342de761cb038a31b9337c4db7f50445d3

PKG_MAINTAINER:=Oskari Rauta <[email protected]>
PKG_LICENSE:=BSD-3-Clause
Expand Down
6 changes: 3 additions & 3 deletions utils/owut/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=owut
PKG_SOURCE_DATE:=2024-10-11
PKG_SOURCE_DATE:=2024-10-15
PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=e17c906dc5f00cc0173cdeb8a25313a17e453866
PKG_SOURCE_VERSION:=cdfbc24c7fb08f4ded018afffc7c2b6e30022d50
PKG_SOURCE_URL:=https://github.com/efahl/owut.git
PKG_MIRROR_HASH:=56b4dc31c08020abd54abd739c00375f84e9b7cf8ab2531bbaa1597e02e6128f
PKG_MIRROR_HASH:=c88dba1a319fc77d8ce4e0cb23bbf46ac4b533d7795da78ddf1db3072d0124fe

PKG_MAINTAINER:=Eric Fahlgren <[email protected]>
PKG_LICENSE:=GPL-2.0-only
Expand Down