Skip to content

Commit ac1ae8c

Browse files
committed
cleanup
1 parent 2dadf1c commit ac1ae8c

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

cross/phpmemcachedadmin/Makefile

-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ include ../../mk/spksrc.install-resources.mk
2323

2424
CONFIG_FOLDER = $(STAGING_INSTALL_PREFIX)/var/phpmemcachedadmin.config
2525

26-
# remarks:
27-
# PLIST must containe rsc:var/*
28-
# without '*' wildcard, the folder is not copied to the staging folder
29-
# for packages for DSM 7
30-
3126
.PHONY: phpmemcachedadmin_install
3227
# link the Config folder into var for backup/restore on package update
3328
# and for on demand creation of the default config on DSM 7.

cross/phpmemcachedadmin/PLIST

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
rsc:share/phpMemcachedAdmin/
2-
rsc:var/*
2+
rsc:var/phpmemcachedadmin.config/

spk/memcached/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ include ../../mk/spksrc.spk.mk
3434

3535
.PHONY: memcached_extra_install
3636
memcached_extra_install:
37-
@install -m 755 -d $(STAGING_DIR)/app $(STAGING_DIR)/var/phpmemcachedadmin.config
37+
@install -m 755 -d $(STAGING_DIR)/app
3838
@install -m 644 src/app/config $(STAGING_DIR)/app/config

spk/memcached/src/service-setup.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ service_postinst ()
2020
fi
2121

2222
if [ "${SYNOPKG_DSM_VERSION_MAJOR}" -lt 7 ]; then
23-
# make config writable by user http
23+
# make config writable by http group
2424
chmod -R g+w ${CONFIG_DIR}
2525
chown -R :http ${SYNOPKG_PKGDEST}/share
26-
# make Temp and other folders ritable by user http
26+
# make Temp and other folders writable by http group
2727
chmod -R g+w ${SYNOPKG_PKGDEST}/share
2828
fi
2929
}

0 commit comments

Comments
 (0)