From df14b70f2284d3900f9d2768a1e496bf0ae3563a Mon Sep 17 00:00:00 2001 From: hgy59 Date: Fri, 2 Feb 2024 00:46:03 +0100 Subject: [PATCH] memcached: fix uninstall on DSM < 7 (#6006) * memcached: fix uninstall on DSM < 7 * limit to DSM version supporting PHP 7.4 --- spk/memcached/Makefile | 1 + spk/memcached/src/service-setup.sh | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/spk/memcached/Makefile b/spk/memcached/Makefile index 38b76e2863d..37e4560b404 100644 --- a/spk/memcached/Makefile +++ b/spk/memcached/Makefile @@ -6,6 +6,7 @@ DSM_UI_DIR = app DEPENDS = cross/phpmemcachedadmin cross/memcached +REQUIRED_MIN_DSM = 6.0 SPK_DEPENDS = WebStation:PHP7.4 MAINTAINER = Diaoul diff --git a/spk/memcached/src/service-setup.sh b/spk/memcached/src/service-setup.sh index fe6b88842fa..46656ed3e4b 100644 --- a/spk/memcached/src/service-setup.sh +++ b/spk/memcached/src/service-setup.sh @@ -1,28 +1,29 @@ +PATH="${SYNOPKG_PKGDEST}/bin:${PATH}" +CONFIG_DIR="${SYNOPKG_PKGVAR}/phpmemcachedadmin.config" + +MEMCACHED="${SYNOPKG_PKGDEST}/bin/memcached" +MEMORY=$(awk '/MemTotal/{memory=$2/1024*0.15; if (memory > 64) memory=64; printf "%0.f", memory}' /proc/meminfo) +SERVICE_COMMAND="${MEMCACHED} -d -m ${MEMORY} -P ${PID_FILE}" + + if [ "${SYNOPKG_DSM_VERSION_MAJOR}" -lt 7 ]; then # for DSM < 7 # for owner of var folder GROUP=http + WEB_DIR=/var/services/web fi -PATH="${SYNOPKG_PKGDEST}/bin:${PATH}" -MEMCACHED="${SYNOPKG_PKGDEST}/bin/memcached" -MEMORY=$(awk '/MemTotal/{memory=$2/1024*0.15; if (memory > 64) memory=64; printf "%0.f", memory}' /proc/meminfo) -SERVICE_COMMAND="${MEMCACHED} -d -m ${MEMORY} -P ${PID_FILE}" - service_postinst () { # create config file on demand - if [ ! -e "${SYNOPKG_PKGVAR}/phpmemcachedadmin.config/Memcache.php" ]; then + if [ ! -e ${CONFIG_DIR}/Memcache.php ]; then echo "Create default config file Memcache.php" - cp -f ${SYNOPKG_PKGVAR}/phpmemcachedadmin.config/Memcache.sample.php ${SYNOPKG_PKGVAR}/phpmemcachedadmin.config/Memcache.php + cp -f ${CONFIG_DIR}/Memcache.sample.php ${CONFIG_DIR}/Memcache.php fi if [ "${SYNOPKG_DSM_VERSION_MAJOR}" -lt 7 ]; then - CONFIG_DIR="${SYNOPKG_PKGVAR}/phpmemcachedadmin.config" - WEB_DIR="/var/services/web" - # Install the web interface cp -R "${SYNOPKG_PKGDEST}/share/phpMemcachedAdmin" ${WEB_DIR}