Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 52da15f
Merge: 2c63f21 7c58cd6
Author: korolartemnexus <[email protected]>
Date:   Wed Feb 5 09:25:25 2025 +0200

    Merge branch 'openwrt:master' into master

commit 7c58cd6
Author: Francesco Benini <[email protected]>
Date:   Sat Feb 1 23:13:22 2025 +0100

    keepalived: add support for directory sync

    This commit adds support for folder synchronization.
    An example is in the 810-files file where it is explained how to
    synchronize all hotplug files of keepalived.

    Signed-off-by: Francesco Benini <[email protected]>

commit 8eecd2e
Author: Milinda Brantini <[email protected]>
Date:   Wed Feb 5 12:47:26 2025 +0800

    sing-box: Update to 1.11.1

    Signed-off-by: Milinda Brantini <[email protected]>

commit 2c63f21
Author: korolartemnexus <[email protected]>
Date:   Mon Feb 3 16:01:18 2025 +0200

    ddns-scripts: add support for tb.netassist.ua

    Adds tb.netassist.ua service as DDNS provider
    Docs: https://tb.netassist.ua
    Signed-off-by: Artem Korol<[email protected]>
  • Loading branch information
korolartemnexus committed Feb 5, 2025
1 parent 140df03 commit 117424c
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"ipv4": {
"url": "https://tb.netassist.ua/autochangeip.php?l=[USERNAME]&p=[PASSWORD]&ip=[IP]"
}
}
}
1 change: 1 addition & 0 deletions net/ddns-scripts/files/usr/share/ddns/list
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ sitelutions.com
spdyn.de
strato.com
system-ns.com
tb.netassist.ua
thatip.com
transip.nl
twodns.de
Expand Down
2 changes: 1 addition & 1 deletion net/keepalived/Makefile
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.3.1
PKG_RELEASE:=2
PKG_RELEASE:=3

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.keepalived.org/software
Expand Down
3 changes: 3 additions & 0 deletions net/keepalived/files/etc/hotplug.d/keepalived/810-files
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ add_sync_file /etc/shinit
add_sync_file /etc/sysctl.conf
add_sync_file /tmp/dhcp.leases

# uncomment the following line and add /etc/hotplug.d/keepalived to sysupgrade.conf or keepalived configuration in order to enable hotplug scripts sync
# add_sync_file /etc/hotplug.d/keepalived

keepalived_hotplug
13 changes: 12 additions & 1 deletion net/keepalived/files/lib/functions/keepalived/hotplug.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,17 @@ is_sync_file() {
list_contains SYNC_FILES_LIST "$1"
}

is_sync_file_in_folder() {
local f="$1"
while [ "$f" != "" ]; do
f="${f%/*}"
if list_contains SYNC_FILES_LIST "$f"; then
return 0
fi
done
return 1
}

_set_update_target() {
set_var UPDATE_TARGET "${1:-1}"
}
Expand Down Expand Up @@ -227,7 +238,7 @@ _notify_sync() {
return
fi

is_sync_file "$RSYNC_TARGET" || return
is_sync_file "$RSYNC_TARGET" || is_sync_file_in_folder "$RSYNC_TARGET" || return

if ! cp -a "$RSYNC_SOURCE" "$RSYNC_TARGET"; then
log_err "can not copy $RSYNC_SOURCE => $RSYNC_TARGET"
Expand Down
7 changes: 3 additions & 4 deletions net/keepalived/files/usr/share/keepalived/scripts/rsync.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,10 @@ ha_sync_send() {
config_get sync_list "$cfg" sync_list

for sync_file in $sync_list $(sysupgrade -l); do
[ -f "$sync_file" ] && {
dir="${sync_file%/*}"
list_contains files_list "${sync_file}" || append files_list "${sync_file}"
}
[ -f "$sync_file" ] && dir="${sync_file%/*}"
[ -d "$sync_file" ] && dir="${sync_file}"

list_contains files_list "${sync_file}" || append files_list "${sync_file}"
list_contains dirs_list "${sync_dir}${dir}" || append dirs_list "${sync_dir}${dir}"
done

Expand Down
4 changes: 2 additions & 2 deletions net/sing-box/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=sing-box
PKG_VERSION:=1.11.0
PKG_VERSION:=1.11.1
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=d4a48b2fe450041fea2d25955ddc092a62afc8da7bb442b49cb12575123b2edb
PKG_HASH:=2bdc5bbc12e43d56f558458b22394d285bec5d0c98e0ab31dc3d74fa2ed6a195

PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=LICENSE
Expand Down

0 comments on commit 117424c

Please sign in to comment.