update ipset service

services/ipset/Makefile

@@ -1,20 +1,24 @@
+all: build release
+
 build:
 	pyinstaller ipset.spec
 
-release:
+release: build
 	mkdir -p ./release/ipset
 	rm -rf ./release/ipset/*
 	pyinstaller ipset.spec
 	cp -f ./run.sh ./release/ipset
 	cp -f ./install.sh ./release/ipset
+	cp -f ./uninstall.sh ./release/ipset
 	cp -r ./dist ./release/ipset/bin
 	cp -f ./ipset.service ./release/ipset
+	cp -r ./conf  ./release/ipset/conf
 
 install:
 	mkdir -p /usr/local/ipset
 	cp -r ./dist /usr/local/ipset/bin
 	cp -f ./run.sh /usr/local/ipset
-	cp ipset.service  /usr/lib/systemd/system
+	cp ipset.service  /etc/systemd/system
 	systemctl enable ipset
 	systemctl start ipset
 

services/ipset/conf/01-netcfg.yaml

@@ -5,7 +5,7 @@ network:
     eth0: # 请替换为你的实际接口名，如 ens33
       dhcp4: no
       addresses:
-        - 192.168.1.107/24 # 静态IP地址和子网掩码位数
+        - 192.168.1.101/24 # 静态IP地址和子网掩码位数
       routes:
         - to: default
           via: 192.168.1.1  # 网关地址

services/ipset/install.sh

@@ -3,7 +3,12 @@
 mkdir -p /usr/local/ipset/bin
 cp -f ./bin/ipset /usr/local/ipset/bin
 cp -f ./run.sh /usr/local/ipset
-cp -f ./ipset.service /usr/lib/systemd/system
+cp -f ./ipset.service /etc/systemd/system
+rm -rf /etc/netplan/*
+cp -f ./conf/* /etc/netplan
+
+chmod 600 /etc/netplan/*
+netplan apply
 
 systemctl daemon-reload
 systemctl enable --now ipset

services/ipset/ipset.service

@@ -13,8 +13,8 @@ Restart=always
 RestartSec=3
 
 # 如果需要日志
-StandardOutput=journal
-StandardError=journal
+StandardOutput=null
+StandardError=null
 
 [Install]
 WantedBy=multi-user.target

services/ipset/requirements.txt

@@ -0,0 +1,3 @@
+Flask==3.1.2
+gevent==25.9.1
+pyinstaller==6.17.0

services/ipset/uninstall.sh

@@ -2,5 +2,5 @@
 
 systemctl disable --now ipset.service
 rm -r /usr/local/ipset
-rm /usr/lib/systemd/system/ipset.service
+rm /etc/systemd/system/ipset.service
 systemctl daemon-reload