diff options
author | Aaron Andersen <aaron@fosslib.net> | 2019-02-24 09:08:21 -0500 |
---|---|---|
committer | Aaron Andersen <aaron@fosslib.net> | 2019-05-26 07:20:57 -0400 |
commit | 12dec599058036f88f72ec553ee33a3df1f91c49 (patch) | |
tree | 953d1e1d7ceafd5192b72182eb09b25e49efc2e6 /nixos/modules/services/misc/octoprint.nix | |
parent | fbe59432379249bc94e6bf7bafd925f4299596db (diff) | |
download | nixpkgs-12dec599058036f88f72ec553ee33a3df1f91c49.tar nixpkgs-12dec599058036f88f72ec553ee33a3df1f91c49.tar.gz nixpkgs-12dec599058036f88f72ec553ee33a3df1f91c49.tar.bz2 nixpkgs-12dec599058036f88f72ec553ee33a3df1f91c49.tar.lz nixpkgs-12dec599058036f88f72ec553ee33a3df1f91c49.tar.xz nixpkgs-12dec599058036f88f72ec553ee33a3df1f91c49.tar.zst nixpkgs-12dec599058036f88f72ec553ee33a3df1f91c49.zip |
nixos/octoprint: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
Diffstat (limited to 'nixos/modules/services/misc/octoprint.nix')
-rw-r--r-- | nixos/modules/services/misc/octoprint.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index baa7c3ade52..2e17f671a51 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -97,6 +97,10 @@ in gid = config.ids.gids.octoprint; }); + systemd.tmpfiles.rules = [ + "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" + ]; + systemd.services.octoprint = { description = "OctoPrint, web interface for 3D printers"; wantedBy = [ "multi-user.target" ]; @@ -105,7 +109,6 @@ in environment.PYTHONPATH = makeSearchPathOutput "lib" pkgs.python.sitePackages [ pluginsEnv ]; preStart = '' - mkdir -p "${cfg.stateDir}" if [ -e "${cfg.stateDir}/config.yaml" ]; then ${pkgs.yaml-merge}/bin/yaml-merge "${cfg.stateDir}/config.yaml" "${cfgUpdate}" > "${cfg.stateDir}/config.yaml.tmp" mv "${cfg.stateDir}/config.yaml.tmp" "${cfg.stateDir}/config.yaml" @@ -113,14 +116,12 @@ in cp "${cfgUpdate}" "${cfg.stateDir}/config.yaml" chmod 600 "${cfg.stateDir}/config.yaml" fi - chown -R ${cfg.user}:${cfg.group} "${cfg.stateDir}" ''; serviceConfig = { ExecStart = "${pkgs.octoprint}/bin/octoprint serve -b ${cfg.stateDir}"; User = cfg.user; Group = cfg.group; - PermissionsStartOnly = true; }; }; |