diff options
author | Graham Christensen <graham@grahamc.com> | 2019-06-25 18:04:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-25 18:04:22 -0400 |
commit | 38c28ef10c54bf4899d467854e893842cffb4de6 (patch) | |
tree | a4b38800f30b0c9d794715dc1c2c7f193570b011 /nixos/modules/services/web-apps/atlassian/jira.nix | |
parent | 880bc93fc0ad44ea5b973e532c338afeb70d2a71 (diff) | |
parent | de6e5ea8152b29c975096d7d4b7d0938874ee37a (diff) | |
download | nixpkgs-38c28ef10c54bf4899d467854e893842cffb4de6.tar nixpkgs-38c28ef10c54bf4899d467854e893842cffb4de6.tar.gz nixpkgs-38c28ef10c54bf4899d467854e893842cffb4de6.tar.bz2 nixpkgs-38c28ef10c54bf4899d467854e893842cffb4de6.tar.lz nixpkgs-38c28ef10c54bf4899d467854e893842cffb4de6.tar.xz nixpkgs-38c28ef10c54bf4899d467854e893842cffb4de6.tar.zst nixpkgs-38c28ef10c54bf4899d467854e893842cffb4de6.zip |
Merge pull request #56265 from aanderse/permissions-start-only
replace deprecated usage of PermissionsStartOnly (part 2)
Diffstat (limited to 'nixos/modules/services/web-apps/atlassian/jira.nix')
-rw-r--r-- | nixos/modules/services/web-apps/atlassian/jira.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 0b3a5722d6c..b0019e77ac2 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -155,6 +155,17 @@ in users.groups."${cfg.group}" = {}; + systemd.tmpfiles.rules = [ + "d '${cfg.home}' - ${cfg.user} - - -" + "d /run/atlassian-jira - - - - -" + + "L+ /run/atlassian-jira/home - - - - ${cfg.home}" + "L+ /run/atlassian-jira/logs - - - - ${cfg.home}/logs" + "L+ /run/atlassian-jira/work - - - - ${cfg.home}/work" + "L+ /run/atlassian-jira/temp - - - - ${cfg.home}/temp" + "L+ /run/atlassian-jira/server.xml - - - - ${cfg.home}/server.xml" + ]; + systemd.services.atlassian-jira = { description = "Atlassian JIRA"; @@ -174,12 +185,6 @@ in preStart = '' mkdir -p ${cfg.home}/{logs,work,temp,deploy} - mkdir -p /run/atlassian-jira - ln -sf ${cfg.home}/{logs,work,temp,server.xml} /run/atlassian-jira - ln -sf ${cfg.home} /run/atlassian-jira/home - - chown ${cfg.user} ${cfg.home} - sed -e 's,port="8080",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ '' + (lib.optionalString cfg.proxy.enable '' -e 's,protocol="HTTP/1.1",protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${toString cfg.proxy.secure}",' \ @@ -191,7 +196,6 @@ in User = cfg.user; Group = cfg.group; PrivateTmp = true; - PermissionsStartOnly = true; ExecStart = "${pkg}/bin/start-jira.sh -fg"; ExecStop = "${pkg}/bin/stop-jira.sh"; }; |