radicale: fixed hotplug and init script

* fixed hotplug script (not restarting on "ifup")
* fixed init script (not stopping in 1 second)
* fixed PKG_MAINTAINER string
* removing not needed comments in config file

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>

diff --git a/net/radicale/Makefile b/net/radicale/Makefile
index 329ab68f09022074058d18aa97b22891f98a9b6a..f604a9fdf541c7a4488fe3f276686ee5893143f2 100644 (file)
--- a/net/radicale/Makefile
+++ b/net/radicale/Makefile
@@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=radicale
 PKG_VERSION:=0.10
-PKG_RELEASE:=1
-PKG_MAINTAINER:=Christian Schoenebeck <chris5560@web.de>
+PKG_RELEASE:=2
+PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>
 
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING

diff --git a/net/radicale/files/radicale.config b/net/radicale/files/radicale.config
index ea10bc9f487a3f7c1d372c59deb044472bf25d47..58148f8233f25f235b6d4ca7218bcf7912c862e7 100644 (file)
--- a/net/radicale/files/radicale.config
+++ b/net/radicale/files/radicale.config
@@ -71,7 +71,6 @@ config setting 'auth'
        # Value: None | htpasswd | IMAP | LDAP | PAM | courier | http | remote_user | custom
        # Default: None
        # if setting 'htpasswd' the file /etc/radicale/users is used (hardcoded)
-#      option type 'htpasswd'
 
        # Htpasswd encryption method
        # Value: plain | sha1 | ssha | crypt
@@ -98,7 +97,6 @@ config setting 'rights'
        # Value: None | authenticated | owner_only | owner_write | from_file | custom
        # Default: None
        # if setting 'from_file' the file /etc/radicale/rights is used (hardcoded)
-#      option  type    'from_file'
 
        # Custom rights handler
 #      option custom_handler ''

diff --git a/net/radicale/files/radicale.hotplug b/net/radicale/files/radicale.hotplug
index 634ad2efa578edfbc6008ea7c54f674910708be6..3b91419864f7a5a02fbcffbb9441bf18b9b0335d 100644 (file)
--- a/net/radicale/files/radicale.hotplug
+++ b/net/radicale/files/radicale.hotplug
@@ -3,7 +3,7 @@
 # only (re-)start on ifup
 [ "$ACTION" = "ifup" ] || exit 0
 
-_PID=$(ps | grep '[p]ython.*[r]adicale' 2>/dev/null | awk '{print \$1}')
+_PID=$(ps | grep '[p]ython.*[r]adicale' 2>/dev/null | awk '{print $1}')
 kill -1 $_PID 2>/dev/null
 if [ $? -eq 0 ]; then
        # only restart if already running

diff --git a/net/radicale/files/radicale.init b/net/radicale/files/radicale.init
index bb35a18a0fddb77cf636aca0a7c55206466660e4..991ca5051296c390e14d599d728ee7dd96ba1dbc 100755 (executable)
--- a/net/radicale/files/radicale.init
+++ b/net/radicale/files/radicale.init
@@ -208,7 +208,7 @@ stop() {
        local _PID=$(eval "$PGREP")
        [ -z "$_PID" ] && return 0      # not running
        kill -15 $_PID 2>/dev/null
-       sleep 1                 # give time to shutdown
+       sleep 3                 # give time to shutdown
        local _tmp=$(eval "$PGREP")
        if [ -z "$_tmp" ]; then
                logger -p user.notice -t "radicale[$_PID]" "Service shutdown successfully"