diff options
author | Aaron Andersen <aaron@fosslib.net> | 2019-02-24 16:29:33 -0500 |
---|---|---|
committer | Aaron Andersen <aaron@fosslib.net> | 2019-05-26 07:20:57 -0400 |
commit | 114bd801f478a6cd75ba3909fd31b04086296757 (patch) | |
tree | cb2fc5c06067f9dfea91e6d58ef8632ad37c5e9a /nixos/modules/services/web-apps/atlassian/jira.nix | |
parent | 65f449fe333ae24d9ea39928be8d28694a52c106 (diff) | |
download | nixpkgs-114bd801f478a6cd75ba3909fd31b04086296757.tar nixpkgs-114bd801f478a6cd75ba3909fd31b04086296757.tar.gz nixpkgs-114bd801f478a6cd75ba3909fd31b04086296757.tar.bz2 nixpkgs-114bd801f478a6cd75ba3909fd31b04086296757.tar.lz nixpkgs-114bd801f478a6cd75ba3909fd31b04086296757.tar.xz nixpkgs-114bd801f478a6cd75ba3909fd31b04086296757.tar.zst nixpkgs-114bd801f478a6cd75ba3909fd31b04086296757.zip |
nixos/jira: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
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"; }; |