Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
hgy59 committed Jun 4, 2022
1 parent 2dadf1c commit ac1ae8c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 9 deletions.
5 changes: 0 additions & 5 deletions cross/phpmemcachedadmin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ include ../../mk/spksrc.install-resources.mk

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

# remarks:
# PLIST must containe rsc:var/*
# without '*' wildcard, the folder is not copied to the staging folder
# for packages for DSM 7

.PHONY: phpmemcachedadmin_install
# link the Config folder into var for backup/restore on package update
# and for on demand creation of the default config on DSM 7.
Expand Down
2 changes: 1 addition & 1 deletion cross/phpmemcachedadmin/PLIST
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
rsc:share/phpMemcachedAdmin/
rsc:var/*
rsc:var/phpmemcachedadmin.config/
2 changes: 1 addition & 1 deletion spk/memcached/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ include ../../mk/spksrc.spk.mk

.PHONY: memcached_extra_install
memcached_extra_install:
@install -m 755 -d $(STAGING_DIR)/app $(STAGING_DIR)/var/phpmemcachedadmin.config
@install -m 755 -d $(STAGING_DIR)/app
@install -m 644 src/app/config $(STAGING_DIR)/app/config
4 changes: 2 additions & 2 deletions spk/memcached/src/service-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ service_postinst ()
fi

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

0 comments on commit ac1ae8c

Please sign in to comment.