diff options
author | Jean-Baptiste Giraudeau <jb@giraudeau.info> | 2017-11-08 20:20:49 +0100 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-11-09 12:56:11 +0100 |
commit | 3c06d9f0b093e29206ff0b7e78917f198eafb01c (patch) | |
tree | f377e611e5d2fcb8e5d49e1d4af9f65d88a049a6 /nixos/modules/services/web-apps/atlassian/jira.nix | |
parent | c0db9bb9fe153576b892a14ee3592578628f3778 (diff) | |
download | nixpkgs-3c06d9f0b093e29206ff0b7e78917f198eafb01c.tar nixpkgs-3c06d9f0b093e29206ff0b7e78917f198eafb01c.tar.gz nixpkgs-3c06d9f0b093e29206ff0b7e78917f198eafb01c.tar.bz2 nixpkgs-3c06d9f0b093e29206ff0b7e78917f198eafb01c.tar.lz nixpkgs-3c06d9f0b093e29206ff0b7e78917f198eafb01c.tar.xz nixpkgs-3c06d9f0b093e29206ff0b7e78917f198eafb01c.tar.zst nixpkgs-3c06d9f0b093e29206ff0b7e78917f198eafb01c.zip |
Fix atlassian services (optional attr. and systemd)
- Properly handle optional configuration. - Use ExecStart/ExecStop instead of script/stopScript.
Diffstat (limited to 'nixos/modules/services/web-apps/atlassian/jira.nix')
-rw-r--r-- | nixos/modules/services/web-apps/atlassian/jira.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 19b6a8d3085..b730a8ebee4 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -6,7 +6,7 @@ let cfg = config.services.jira; - pkg = pkgs.atlassian-jira.override { + pkg = pkgs.atlassian-jira.override (optionalAttrs cfg.sso.enable { enableSSO = cfg.sso.enable; crowdProperties = '' application.name ${cfg.sso.applicationName} @@ -21,7 +21,7 @@ let session.validationinterval ${toString cfg.sso.validationInterval} session.lastvalidation session.lastvalidation ''; - }; + }); in @@ -183,14 +183,13 @@ in ${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml ''; - script = "${pkg}/bin/start-jira.sh -fg"; - stopScript = "${pkg}/bin/stop-jira.sh"; - serviceConfig = { User = cfg.user; Group = cfg.group; PrivateTmp = true; PermissionsStartOnly = true; + ExecStart = "${pkg}/bin/start-jira.sh -fg"; + ExecStop = "${pkg}/bin/stop-jira.sh"; }; }; }; |