🦄 Sync 2024-09-28 20:32:56

This commit is contained in:
github-actions[bot] 2024-09-28 20:32:56 +08:00
parent 56dc1d74dc
commit f751a787af
4 changed files with 20 additions and 4 deletions

View File

@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=daed
PKG_VERSION=0.6.0
PKG_RELEASE:=65
PKG_RELEASE:=66
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/daeuniverse/daed.git
PKG_SOURCE_VERSION:=604e981d433e5132462a7d1e239d41061cd53d59
PKG_SOURCE_VERSION:=0849a1e122247c1a7d5019e219b4d97635ae91af
PKG_MIRROR_HASH:=skip
PKG_LICENSE:=AGPL-3.0-only MIT

View File

@ -65,6 +65,14 @@ custom_instance() {
let count++
[ "${count}" -ge 5 ] && { rm /var/run/tailscale.wait.pid; exit 19; }
done
if [ "$acceptDNS" = "1" ]; then
MagicDNSSuffix=$(tailscale status --json | awk -F'"' '/"MagicDNSSuffix"/ {last=$(NF-1)} END {print last}')
sed -i '/100.100.100.100/d' /etc/dnsmasq.conf
echo "server=/$MagicDNSSuffix/100.100.100.100" >> /etc/dnsmasq.conf
/etc/init.d/dnsmasq restart
fi
ts0=$(ifconfig | grep 'tailscale' | awk '{print $1}')
if [ -z "$(uci -q get network.tailscale)" ]; then
uci set network.tailscale='interface'
@ -109,8 +117,9 @@ custom_instance() {
uci set firewall.tszone='zone'
uci set firewall.tszone.input='ACCEPT'
uci set firewall.tszone.output='ACCEPT'
uci set firewall.tszone.forward='REJECT'
uci set firewall.tszone.forward='ACCEPT'
uci set firewall.tszone.masq='1'
uci set firewall.tszone.mtu_fix='1'
uci set firewall.tszone.name='tailscale'
uci set firewall.tszone.network='tailscale'
fi
@ -198,6 +207,10 @@ stop_instance() {
local cfg="$1"
/usr/sbin/tailscaled --cleanup
# Remove dnsmasq settings
sed -i '/100.100.100.100/d' /etc/dnsmasq.conf
/etc/init.d/dnsmasq restart
# Remove network settings
uci -q delete network.tailscale
uci -q delete network.ts_lan

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mihomo
PKG_RELEASE:=63
PKG_RELEASE:=64
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/MetaCubeX/mihomo.git

View File

@ -236,6 +236,9 @@ start_service() {
procd_set_param user "$MIHOMO_USER"
procd_set_param group "$MIHOMO_GROUP"
procd_set_param limits core="unlimited"
procd_set_param limits nofile="1048576 1048576"
procd_add_jail mihomo requirejail procfs
procd_add_jail_mount "$PROG" /etc/TZ /etc/localtime /etc/hosts /etc/ssl/certs
procd_add_jail_mount_rw "$RUN_DIR" /dev/net