summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2022-04-09 09:33:59 +0200
committerGitHub <noreply@github.com>2022-04-09 09:33:59 +0200
commit4a72b83416d7b0bc54a62bf3c5fbc7d7bcfef358 (patch)
tree3fb5d0687449382f5dddb305a8dca3606f8b0c04
parentMerge pull request #167954 from NixOS/backport-167790-to-release-21.11 (diff)
parentnextcloud: use tmpfiles to create group-readable home (diff)
downloadnixpkgs-4a72b83416d7b0bc54a62bf3c5fbc7d7bcfef358.tar.gz
Merge pull request #167762 from NixOS/backport-156845-to-release-21.11
[Backport release-21.11] nextcloud: make home group-readable
-rw-r--r--nixos/modules/services/web-apps/nextcloud.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 0416e6242a3e..a344e32d13e7 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -590,6 +590,8 @@ in {
timerConfig.Unit = "nextcloud-cron.service";
};
+ systemd.tmpfiles.rules = ["d ${cfg.home} 0750 nextcloud nextcloud"];
+
systemd.services = {
# When upgrading the Nextcloud package, Nextcloud can report errors such as
# "The files of the app [all apps in /var/lib/nextcloud/apps] were not replaced correctly"
@@ -711,8 +713,6 @@ in {
before = [ "phpfpm-nextcloud.service" ];
path = [ occ ];
script = ''
- chmod og+x ${cfg.home}
-
${optionalString (c.dbpassFile != null) ''
if [ ! -r "${c.dbpassFile}" ]; then
echo "dbpassFile ${c.dbpassFile} is not readable by nextcloud:nextcloud! Aborting..."
@@ -805,7 +805,6 @@ in {
users.users.nextcloud = {
home = "${cfg.home}";
group = "nextcloud";
- createHome = true;
isSystemUser = true;
};
users.groups.nextcloud.members = [ "nextcloud" config.services.nginx.user ];