summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2019-05-19 07:00:47 -0400
committerGitHub <noreply@github.com>2019-05-19 07:00:47 -0400
commitb5a0c38e554eddac6c44cf63f6d63d7803c301f3 (patch)
tree4651569f2a649fa76c1087f2c063086aacaa2540 /nixos/modules
parent49b2e2a18ff0697fc1d58bb252b1a027ecbba2ec (diff)
parente2c58c19c459cdb506d09b1c25758400d36219be (diff)
downloadnixpkgs-b5a0c38e554eddac6c44cf63f6d63d7803c301f3.tar
nixpkgs-b5a0c38e554eddac6c44cf63f6d63d7803c301f3.tar.gz
nixpkgs-b5a0c38e554eddac6c44cf63f6d63d7803c301f3.tar.bz2
nixpkgs-b5a0c38e554eddac6c44cf63f6d63d7803c301f3.tar.lz
nixpkgs-b5a0c38e554eddac6c44cf63f6d63d7803c301f3.tar.xz
nixpkgs-b5a0c38e554eddac6c44cf63f6d63d7803c301f3.tar.zst
nixpkgs-b5a0c38e554eddac6c44cf63f6d63d7803c301f3.zip
Merge pull request #59401 from mguentner/mxisd_1_3
mxisd: 1.2.0 -> 1.4.3
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/networking/mxisd.nix10
1 files changed, 1 insertions, 9 deletions
diff --git a/nixos/modules/services/networking/mxisd.nix b/nixos/modules/services/networking/mxisd.nix
index 0b9824f29fd..02e89f441b3 100644
--- a/nixos/modules/services/networking/mxisd.nix
+++ b/nixos/modules/services/networking/mxisd.nix
@@ -103,20 +103,12 @@ in {
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      # mxisd / spring.boot needs the configuration to be named "application.yaml"
-      preStart = ''
-        config=${cfg.dataDir}/application.yaml
-        cp ${configFile} $config
-        chmod 444 $config
-      '';
-
       serviceConfig = {
         Type = "simple";
         User = "mxisd";
         Group = "mxisd";
-        ExecStart = "${cfg.package}/bin/mxisd --spring.config.location=${cfg.dataDir}/ --spring.profiles.active=systemd --java.security.egd=file:/dev/./urandom";
+        ExecStart = "${cfg.package}/bin/mxisd -c ${configFile}";
         WorkingDirectory = cfg.dataDir;
-        SuccessExitStatus = 143;
         Restart = "on-failure";
       };
     };