OpenWRT
/
packages
mirror of https://github.com/openwrt/packages.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8102 from jefferyto/clamav-init 

clamav: Update init scripts
pull/8141/head
Hannu Nyman 2019-02-05 17:22:44 +02:00 committed by GitHub
parent 6adb419a25 9a7ffc7703
commit e643653a49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/clamav/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=clamav
PKG_VERSION:=0.101.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr> \

20
net/clamav/files/clamav.init
View File

@ -9,7 +9,7 @@ PROG=/usr/sbin/clamd
CLAMD_CONFIGFILE="/tmp/clamav/clamd.conf"
validate_clamav_section() {
uci_validate_section clamav clamav "${1}" \
uci_load_validate clamav clamav "$1" "$2" \
'clamd_config_file:string' \
'LogFile:string' \
'LogFileMaxSize:string' \
@ -46,15 +46,8 @@ validate_clamav_section() {
'DatabaseDirectory:string'
}
start_service() {
local clamd_config_file LogFile LogTime StreamMinPort \
StreamMaxPort MaxThreads ReadTimeout CommandReadTimeout MaxDirectoryRecursion \
FollowFileSymlinks FollowDirectorySymlinks SelfCheck DetectPUA ScanPE DisableCertCheck \
ScanELF DetectBrokenExecutables ScanOLE2 ScanPDF ScanSWF ScanMail ScanPartialMessages \
ScanArchive TemporaryDirectory ArchiveBlockEncrypted MaxFileSize LocalSocket User \
DatabaseDirectory
validate_clamav_section clamav || {
start_clamav_instance() {
[ "$2" = 0 ] || {
echo "validation failed"
return 1
}
@ -107,9 +100,14 @@ start_service() {
procd_close_instance
}
start_service()
{
validate_clamav_section clamav start_clamav_instance
}
stop_service()
{
service_stop ${PROG}
service_stop $PROG
}
service_triggers()

14
net/clamav/files/freshclam.init
View File

@ -9,7 +9,7 @@ PROG=/usr/sbin/freshclam
FRESHCLAM_CONFIGFILE="/tmp/clamav/freshclam.conf"
validate_freshclam_section() {
uci_validate_section freshclam freshclam "${1}" \
uci_load_validate freshclam freshclam "$1" "$2" \
'freshclam_config_file:string' \
'UpdateLogFile:string' \
'DatabaseMirror:string' \
@ -19,11 +19,8 @@ validate_freshclam_section() {
'DatabaseDirectory:string:'
}
start_service() {
local freshclam_config_file UpdateLogFile DatabaseOwner NotifyClamd DatabaseMirror \
DatabaseDirectory
validate_freshclam_section freshclam || {
start_freshclam_instance() {
[ "$2" = 0 ] || {
echo "validation failed"
return 1
}
@ -51,6 +48,11 @@ start_service() {
procd_close_instance
}
start_service()
{
validate_freshclam_section freshclam start_freshclam_instance
}
stop_service()
{
[ ! -f /tmp/freshclam.pid ] && echo "not running" && return 0