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

v0.9.1. Modules moved to /usr/libexec/ruantiblock

Browse Source
This commit is contained in:
gSpot
2021-12-11 21:07:38 +03:00
parent 6ae28198ae
commit 12afe2a532
11 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruantiblock/Makefile
+2 -2
View File
@@ -5,8 +5,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ruantiblock
PKG_VERSION:=0.9.0
PKG_RELEASE:=3
PKG_VERSION:=0.9.1
PKG_RELEASE:=1
PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
ruantiblock/files/etc/ruantiblock/ruantiblock.conf
+3 -3
View File
@@ -4,7 +4,7 @@
### Директория данных (генерируемые конфиги dnsmasq, ipset и пр.)
DATA_DIR="/etc/ruantiblock/var"
### Директория исполняемых скриптов
EXEC_DIR="/usr/bin"
MODULES_DIR="/usr/libexec/ruantiblock"
### Команда для перезапуска dnsmasq
DNSMASQ_RESTART_CMD="/etc/init.d/dnsmasq restart"
### Директория для html-страницы статуса (не используется в OpenWrt)
@@ -51,8 +51,8 @@ MODULE_RUN_ATTEMPTS=3
MODULE_RUN_TIMEOUT=60
### Модули для получения и обработки блэклиста
BLLIST_MODULE=""
#BLLIST_MODULE="/usr/bin/ruab_parser.lua"
#BLLIST_MODULE="/usr/bin/ruab_parser.py"
#BLLIST_MODULE="/usr/libexec/ruantiblock/ruab_parser.lua"
#BLLIST_MODULE="/usr/libexec/ruantiblock/ruab_parser.py"
### Настройки модулей-парсеров ###
ruantiblock/files/usr/bin/ruantiblock
+20 -26
View File
@@ -16,7 +16,7 @@ export LANGUAGE="en"
CONFIG_DIR="/etc/${NAME}"
CONFIG_FILE="${CONFIG_DIR}/${NAME}.conf"
export DATA_DIR="${CONFIG_DIR}/var"
export EXEC_DIR="/usr/bin"
export MODULES_DIR="/usr/bin"
### Команда для перезапуска dnsmasq
export DNSMASQ_RESTART_CMD="/etc/init.d/dnsmasq restart"
@@ -68,8 +68,8 @@ export MODULE_RUN_ATTEMPTS=3
export MODULE_RUN_TIMEOUT=60
### Модули для получения и обработки блэклиста
export BLLIST_MODULE=""
#export BLLIST_MODULE="${EXEC_DIR}/ruab_parser.lua"
#export BLLIST_MODULE="${EXEC_DIR}/ruab_parser.py"
#export BLLIST_MODULE="${MODULES_DIR}/ruab_parser.lua"
#export BLLIST_MODULE="${MODULES_DIR}/ruab_parser.py"
##############################
@@ -145,7 +145,7 @@ if [ $USE_LOGGER = "1" -a $? -ne 0 ]; then
echo " Logger doesn't exists" >&2
USE_LOGGER=0
fi
LOGGER_PARAMS="-t `basename $0`[${$}] -p user.notice"
LOGGER_PARAMS="-t `basename $0` -p user.notice"
export DNSMASQ_DATA_FILE="${DATA_DIR}/${NAME}.dnsmasq"
export IP_DATA_FILE="${DATA_DIR}/${NAME}.ip"
export IPSET_IP="${NAME}-ip"
@@ -211,14 +211,8 @@ EOF
}
MakeLogRecord() {
local _log_level
if [ $USE_LOGGER = "1" ]; then
if [ -z "$2" ]; then
_log_level="info"
else
_log_level="$2"
fi
$LOGGER_CMD $LOGGER_PARAMS -p "user.${_log_level}" "$1"
$LOGGER_CMD $LOGGER_PARAMS -p "user.${1}" "$2"
fi
}
@@ -261,7 +255,7 @@ TotalProxyOn() {
IptTotalProxyAdd
if [ $? -eq 0 ]; then
echo " ${IPSET_TOTAL_PROXY} enabled"
MakeLogRecord "${IPSET_TOTAL_PROXY} enabled" "notice"
MakeLogRecord "notice" "${IPSET_TOTAL_PROXY} enabled"
fi
MakeToken
fi
@@ -274,7 +268,7 @@ TotalProxyOff() {
echo " ${IPSET_TOTAL_PROXY} is already disabled" >&2
else
echo " ${IPSET_TOTAL_PROXY} disabled"
MakeLogRecord "${IPSET_TOTAL_PROXY} disabled" "notice"
MakeLogRecord "notice" "${IPSET_TOTAL_PROXY} disabled"
fi
MakeToken
fi
@@ -296,7 +290,7 @@ AddIptRules() {
}
DelIptRules() {
IptLocalClientsDel
IptLocalClientsDel
IptMainDel
}
@@ -334,7 +328,7 @@ FillIpsets() {
FlushIpSets "$IPSET_IP_TMP" "$IPSET_CIDR_TMP"
else
echo " Error! Ipset wasn't updated" >&2
MakeLogRecord "Error! Ipset wasn't updated" "err"
MakeLogRecord "err" "Error! Ipset wasn't updated"
fi
fi
}
@@ -420,7 +414,7 @@ GetDataFiles() {
[ $_return_code -eq 0 ] && break
### STDOUT
echo " Module run attempt ${_attempt}: failed [${BLLIST_MODULE}]"
MakeLogRecord "Module run attempt ${_attempt}: failed [${BLLIST_MODULE}]" "err"
MakeLogRecord "err" "Module run attempt ${_attempt}: failed [${BLLIST_MODULE}]"
_attempt=`expr $_attempt + 1`
[ $_attempt -gt $MODULE_RUN_ATTEMPTS ] && break
sleep $MODULE_RUN_TIMEOUT
@@ -433,7 +427,7 @@ GetDataFiles() {
}' "$UPDATE_STATUS_FILE"`
### STDOUT
echo " ${_update_string}"
MakeLogRecord "${_update_string}" "info"
MakeLogRecord "notice" "${_update_string}"
printf " `date +%d.%m.%Y-%H:%M`\n" >> "$UPDATE_STATUS_FILE"
fi
else
@@ -467,11 +461,11 @@ Update() {
MakeToken
if [ -e "$UPDATE_PID_FILE" ] && [ "$1" != "force-update" ]; then
echo " ${NAME} ${1} - Error! Another instance of update is already running" >&2
MakeLogRecord "${1} - Error! Another instance of update is already running" "err"
MakeLogRecord "err" "${1} - Error! Another instance of update is already running"
_return_code=2
else
echo " ${NAME} ${1}..."
MakeLogRecord "${1}..." "notice"
MakeLogRecord "notice" "${1}..."
if [ "$IPSET_CLEAR_SETS" = "1" ]; then
FlushIpSets "$IPSET_IP" "$IPSET_CIDR" "$IPSET_DNSMASQ"
fi
@@ -479,16 +473,16 @@ Update() {
case $? in
0)
echo " Blacklist updated"
MakeLogRecord "Blacklist updated" "info"
MakeLogRecord "notice" "Blacklist updated"
;;
2)
echo " Error! Blacklist update error" >&2
MakeLogRecord "Error! Blacklist update error" "err"
MakeLogRecord "err" "Error! Blacklist update error"
_return_code=1
;;
*)
echo " Module error! [${BLLIST_MODULE}]" >&2
MakeLogRecord "Module error! [${BLLIST_MODULE}]" "err"
MakeLogRecord "err" "Module error! [${BLLIST_MODULE}]"
_return_code=1
;;
esac
@@ -515,13 +509,13 @@ Start() {
_return_code=1
else
echo " ${NAME} ${1}..."
MakeLogRecord "${1}..." "notice"
MakeLogRecord "info" "${1}..."
DropNetConfig &> /dev/null
SetNetConfig
PreStartCheck
FillIpsets
_return_code=$?
### Start script
### Start-script
[ -x "$START_SCRIPT" ] && $START_SCRIPT > /dev/null 2>&1 &
fi
rm -f "$START_PID_FILE"
@@ -534,10 +528,10 @@ Stop() {
if CheckStatus; then
MakeToken
echo " ${NAME} ${1}..."
MakeLogRecord "${1}..." "notice"
MakeLogRecord "info" "${1}..."
DropNetConfig &> /dev/null
_return_code=$?
### Stop script
### Stop-script
[ -x "$STOP_SCRIPT" ] && $STOP_SCRIPT > /dev/null 2>&1 &
MakeToken
else