Browse Source

Merge pull request #6931 from chris5560/radicale_master

radicale: add extra command "export_storage" to init script
lilik-openwrt-22.03
Hannu Nyman 6 years ago
committed by GitHub
parent
commit
8256f63546
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 2 deletions
  1. +2
    -2
      net/radicale/Makefile
  2. +29
    -0
      net/radicale/files/radicale.init

+ 2
- 2
net/radicale/Makefile View File

@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=radicale PKG_NAME:=radicale
PKG_VERSION:=1.1.6 PKG_VERSION:=1.1.6
PKG_RELEASE:=1
PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>
PKG_RELEASE:=2
PKG_MAINTAINER:=
PKG_LICENSE:=GPL-3.0 PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING


+ 29
- 0
net/radicale/files/radicale.init View File

@ -4,6 +4,11 @@
START=80 START=80
STOP=10 STOP=10
EXTRA_COMMANDS="export_storage"
EXTRA_HELP=" export_storage <PATH>
- export the storage into the specified folder
- <PATH> can be directly used with the default storage backend of Radicale 2.x.x."
CFGDIR=/var/etc/radicale CFGDIR=/var/etc/radicale
SYSCFG=$CFGDIR/config SYSCFG=$CFGDIR/config
LOGCFG=$CFGDIR/logging LOGCFG=$CFGDIR/logging
@ -162,6 +167,30 @@ _set_permission() {
chgrp -R radicale $DATADIR chgrp -R radicale $DATADIR
} }
export_storage() {
# if already running do nothing
local _PID=$(eval "$PGREP")
kill -1 $_PID 2>/dev/null && {
echo "Export failed !!! - Service running !" >&2
logger -p user.error -t "radicale[$_PID]" "Export failed !!! - Service running !"
return 1
}
[ $# -ne 1 ] || [ ! -d $1 ] && {
echo "Export failed !!! Directory not given or does not exist !" >&2
logger -p user.error -t "radicale[----]" "Export failed !!! Directory not given or does not exist !"
return 1
}
_uci2radicale
_set_permission
chmod 775 $1
chgrp radicale $1
radicale --config=$SYSCFG --export-storage $1/export
}
boot() { boot() {
# wait a given time (default 10 seconds) before startup # wait a given time (default 10 seconds) before startup
# to wait for interfaces to come up / not using hotplug events during boot # to wait for interfaces to come up / not using hotplug events during boot


Loading…
Cancel
Save