Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix package user in privilege file #4781

Merged
merged 2 commits into from
Aug 18, 2021
Merged

fix package user in privilege file #4781

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45909c5
use sponge for in-place update with jq.
hgy59 Aug 15, 2021
58a6dac
remove obsolete redirection
hgy59 Aug 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions mk/spksrc.service.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,28 +171,28 @@ $(DSM_CONF_DIR)/resource:
$(create_target_dir)
@echo '{}' > $@
ifneq ($(strip $(SERVICE_PORT)),)
@jq '."port-config"."protocol-file" = "$(DSM_UI_DIR)/$(SPK_NAME).sc"' $@ 1<>$@
@jq '."port-config"."protocol-file" = "$(DSM_UI_DIR)/$(SPK_NAME).sc"' $@ | sponge $@
endif
ifneq ($(strip $(FWPORTS)),)
# e.g. FWPORTS=src/foo.sc
@jq --arg file $(FWPORTS) \
'."port-config"."protocol-file" = "$(DSM_UI_DIR)/"+($$file | split("/")[-1])' $@ 1<>$@
'."port-config"."protocol-file" = "$(DSM_UI_DIR)/"+($$file | split("/")[-1])' $@ | sponge $@
endif
ifneq ($(strip $(SPK_COMMANDS)),)
# e.g. SPK_COMMANDS=bin/foo bin/bar
@jq --arg binaries '$(SPK_COMMANDS)' \
'."usr-local-linker" = {"bin": $$binaries | split(" ")}' $@ 1<>$@
'."usr-local-linker" = {"bin": $$binaries | split(" ")}' $@ | sponge $@
endif
ifneq ($(strip $(SPK_USR_LOCAL_LINKS)),)
# e.g. SPK_USR_LOCAL_LINKS=etc:var/foo lib:libs/bar
@jq --arg links_str '${SPK_USR_LOCAL_LINKS}' \
'."usr-local-linker" += ($$links_str | split (" ") | map(split(":")) | group_by(.[0]) | map({(.[0][0]) : map(.[1])}) | add )' $@ 1<>$@
'."usr-local-linker" += ($$links_str | split (" ") | map(split(":")) | group_by(.[0]) | map({(.[0][0]) : map(.[1])}) | add )' $@ | sponge $@
endif
ifneq ($(strip $(SERVICE_WIZARD_SHARE)),)
# e.g. SERVICE_WIZARD_SHARE=wizard_download_dir
ifeq ($(call version_ge, ${TCVERSION}, 7.0),1)
@jq --arg share "{{${SERVICE_WIZARD_SHARE}}}" --arg user sc-${SPK_USER} \
'."data-share" = {"shares": [{"name": $$share, "permission":{"rw":[$$user]}} ] }' $@ 1<>$@
'."data-share" = {"shares": [{"name": $$share, "permission":{"rw":[$$user]}} ] }' $@ | sponge $@
endif
endif
SERVICE_FILES += $(DSM_CONF_DIR)/resource
Expand Down Expand Up @@ -260,19 +260,19 @@ ifneq ($(strip $(GROUP)),)
# Creates group but is different from the groups the user can create, they are invisible in the UI an are only usefull to access another packages permissions (ffmpeg comes to mind)
# For DSM7 I recommend setting permissions for individual packages (System Internal User)
# or use the shared folder resource worker to add permissions, ask user from wizard see transmission package for an example
@jq --arg packagename $(GROUP) '."join-pkg-groupnames" += [{$$packagename}]' $@ 1<>$@
@jq --arg packagename $(GROUP) '."join-pkg-groupnames" += [{$$packagename}]' $@ | sponge $@
endif
ifneq ($(strip $(SYSTEM_GROUP)),)
# options: http, system
@jq '."join-groupname" = "$(SYSTEM_GROUP)"' $@ 1<>$@
@jq '."join-groupname" = "$(SYSTEM_GROUP)"' $@ | sponge $@
endif
ifneq ($(strip $(SPK_USER)),)
@jq '."username" = "sc-$(SPK_USER)"' $@ 1<>$@
@jq '."username" = "sc-$(SPK_USER)"' $@ | sponge $@
endif
ifneq ($(strip $(SPK_GROUP)),)
@jq '."groupname" = "$(SPK_GROUP)"' $@ 1<>$@
@jq '."groupname" = "$(SPK_GROUP)"' $@ | sponge $@
else
@jq '."groupname" = "sc-$(SPK_USER)"' $@ 1<>$@
@jq '."groupname" = "sc-$(SPK_USER)"' $@ | sponge $@
endif
ifneq ($(findstring conf,$(SPK_CONTENT)),conf)
SPK_CONTENT += conf
Expand All @@ -291,13 +291,13 @@ $(DSM_CONF_DIR)/privilege: $(SPKSRC_MK)spksrc.service.privilege-startasroot
endif
ifneq ($(strip $(SYSTEM_GROUP)),)
# options: http, system
@jq '."join-groupname" = "$(SYSTEM_GROUP)"' $@ 1<>$@
@jq '."join-groupname" = "$(SYSTEM_GROUP)"' $@ | sponge $@
endif
ifneq ($(strip $(SPK_USER)),)
@jq '."username" = "sc-$(SPK_USER)"' $@ 1<>$@
@jq '."username" = "sc-$(SPK_USER)"' $@ | sponge $@
endif
ifneq ($(strip $(SPK_GROUP)),)
@jq '."groupname" = "$(SPK_GROUP)"' $@ 1<>$@
@jq '."groupname" = "$(SPK_GROUP)"' $@ | sponge $@
endif
ifneq ($(findstring conf,$(SPK_CONTENT)),conf)
SPK_CONTENT += conf
Expand Down