i11th/ruantiblock_openwrt
1
0
Fork 0
mirror of https://github.com/gSpotx2f/ruantiblock_openwrt.git synced 2026-05-14 14:40:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
gSpot
2023-04-26 17:50:23 +03:00
parent 406a7c7c09
commit 55f511c6f6
6 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
luci-app-ruantiblock/Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
# #
# (с) 2020 gSpot (https://github.com/gSpotx2f/ruantiblock_openwrt) # (с) 2023 gSpot (https://github.com/gSpotx2f/ruantiblock_openwrt)
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
ruantiblock-mod-lua/Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
# #
# (с) 2020 gSpot (https://github.com/gSpotx2f/ruantiblock_openwrt) # (с) 2023 gSpot (https://github.com/gSpotx2f/ruantiblock_openwrt)
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
ruantiblock-mod-py/Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
# #
# (с) 2020 gSpot (https://github.com/gSpotx2f/ruantiblock_openwrt) # (с) 2023 gSpot (https://github.com/gSpotx2f/ruantiblock_openwrt)
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
ruantiblock/Makefile
+10 -16
View File
@@ -1,12 +1,12 @@
# #
# (с) 2020 gSpot (https://github.com/gSpotx2f/ruantiblock_openwrt) # (с) 2023 gSpot (https://github.com/gSpotx2f/ruantiblock_openwrt)
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ruantiblock PKG_NAME:=ruantiblock
PKG_VERSION:=1.1 PKG_VERSION:=1.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt> PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@@ -24,6 +24,11 @@ define Package/$(PKG_NAME)/description
endef endef
define Package/$(PKG_NAME)/conffiles define Package/$(PKG_NAME)/conffiles
/etc/config/ruantiblock
/etc/ruantiblock/ruantiblock.conf
/etc/ruantiblock/fqdn_filter
/etc/ruantiblock/ip_filter
/etc/ruantiblock/user_entries
endef endef
define Build/Configure define Build/Configure
@@ -41,7 +46,9 @@ define Package/$(PKG_NAME)/install
$(INSTALL_BIN) ./files/etc/hotplug.d/iface/40-ruantiblock $(1)/etc/hotplug.d/iface/40-ruantiblock $(INSTALL_BIN) ./files/etc/hotplug.d/iface/40-ruantiblock $(1)/etc/hotplug.d/iface/40-ruantiblock
$(INSTALL_DIR) $(1)/etc/ruantiblock $(INSTALL_DIR) $(1)/etc/ruantiblock
$(INSTALL_CONF) ./files/etc/ruantiblock/ruantiblock.conf $(1)/etc/ruantiblock/ruantiblock.conf $(INSTALL_CONF) ./files/etc/ruantiblock/ruantiblock.conf $(1)/etc/ruantiblock/ruantiblock.conf
$(INSTALL_CONF) ./files/etc/ruantiblock/fqdn_filter $(1)/etc/ruantiblock/fqdn_filter $(INSTALL_DATA) ./files/etc/ruantiblock/fqdn_filter $(1)/etc/ruantiblock/fqdn_filter
$(INSTALL_DATA) ./files/etc/ruantiblock/ip_filter $(1)/etc/ruantiblock/ip_filter
$(INSTALL_DATA) ./files/etc/ruantiblock/user_entries $(1)/etc/ruantiblock/user_entries
$(INSTALL_DIR) $(1)/usr/share/ruantiblock $(INSTALL_DIR) $(1)/usr/share/ruantiblock
$(INSTALL_DATA) ./files/usr/share/ruantiblock/config_script $(1)/usr/share/ruantiblock/config_script $(INSTALL_DATA) ./files/usr/share/ruantiblock/config_script $(1)/usr/share/ruantiblock/config_script
$(INSTALL_DATA) ./files/usr/share/ruantiblock/info_output $(1)/usr/share/ruantiblock/info_output $(INSTALL_DATA) ./files/usr/share/ruantiblock/info_output $(1)/usr/share/ruantiblock/info_output
@@ -53,23 +60,10 @@ endef
define Package/$(PKG_NAME)/preinst define Package/$(PKG_NAME)/preinst
#!/bin/sh #!/bin/sh
RUAB_CFG_DIR="/etc/ruantiblock"
BACKUP_DIR="$${RUAB_CFG_DIR}/autoinstall.bak.`date +%s`"
FILE_CONFIG="$${RUAB_CFG_DIR}/ruantiblock.conf"
FILE_FQDN_FILTER="$${RUAB_CFG_DIR}/fqdn_filter"
FILE_IP_FILTER="$${RUAB_CFG_DIR}/ip_filter"
FILE_USER_ENTRIES="$${RUAB_CFG_DIR}/user_entries"
FILE_UCI_CONFIG="/etc/config/ruantiblock"
FILE_MAIN_SCRIPT="/usr/bin/ruantiblock" FILE_MAIN_SCRIPT="/usr/bin/ruantiblock"
test -e "$$FILE_MAIN_SCRIPT" && $$FILE_MAIN_SCRIPT destroy test -e "$$FILE_MAIN_SCRIPT" && $$FILE_MAIN_SCRIPT destroy
mkdir -p "$$BACKUP_DIR"
for _file in "$$FILE_CONFIG" "$$FILE_FQDN_FILTER" "$$FILE_IP_FILTER" "$$FILE_USER_ENTRIES" "$$FILE_UCI_CONFIG"
do
[ -e "$$_file" ] && cp -f "$$_file" "$${BACKUP_DIR}/`basename $$_file`"
done
exit 0 exit 0
endef endef
ruantiblock/files/etc/ruantiblock/ip_filter
View File
ruantiblock/files/etc/ruantiblock/user_entries
View File