commit 1d497bbff1932942c1243650267d998ca7cbc6dd · pyrox.dev/nixpkgs

+18 -4
nixos/modules/services/monitoring/riemann.nix
···

       17
       17
        
       

     

       18
       18
        
         launcher = writeScriptBin "riemann" ''

     

       19
       19
        
           #!/bin/sh

     

       20
       20
       -
           exec ${jdk}/bin/java ${concatStringsSep "\n" cfg.extraJavaOpts} \

     

       20
       20
       +
           exec ${jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOpts} \

     

       21
       21
        
             -cp ${classpath} \

     

       22
       22
       -
             riemann.bin ${writeText "riemann-config.clj" riemannConfig}

     

       22
       22
       +
             riemann.bin ${cfg.configFile}

     

       23
       23
        
         '';

     

       24
       24
        
       

     

       25
       25
        
       in {

     
···

       37
       37
        
             config = mkOption {

     

       38
       38
        
               type = types.lines;

     

       39
       39
        
               description = ''

     

       40
       40
       -
                 Contents of the Riemann configuration file.

     

       40
       40
       +
                 Contents of the Riemann configuration file. For more complicated

     

       41
       41
       +
                 config you should use configFile.

     

       41
       42
        
               '';

     

       42
       43
        
             };

     

       43
       44
        
             configFiles = mkOption {

     
···

       47
       48
        
                 Extra files containing Riemann configuration. These files will be

     

       48
       49
        
                 loaded at runtime by Riemann (with Clojure's

     

       49
       50
        
                 <literal>load-file</literal> function) at the end of the

     

       50
       50
       -
                 configuration.

     

       51
       51
       +
                 configuration if you use the config option, this is ignored if you

     

       52
       52
       +
                 use configFile.

     

       53
       53
       +
               '';

     

       54
       54
       +
             };

     

       55
       55
       +
             configFile = mkOption {

     

       56
       56
       +
               type = types.str;

     

       57
       57
       +
               description = ''

     

       58
       58
       +
                 A Riemann config file. Any files in the same directory as this file

     

       59
       59
       +
                 will be added to the classpath by Riemann.

     

       51
       60
        
               '';

     

       52
       61
        
             };

     

       53
       62
        
             extraClasspathEntries = mkOption {

     
···

       77
       86
        
             group = "riemann";

     

       78
       87
        
           };

     

       79
       88
        
       

     

       89
       89
       +
           services.riemann.configFile = mkDefault (

     

       90
       90
       +
             writeText "riemann-config.clj" riemannConfig

     

       91
       91
       +
           );

     

       92
       92
       +
       

     

       80
       93
        
           systemd.services.riemann = {

     

       81
       94
        
             wantedBy = [ "multi-user.target" ];

     

       82
       95
        
             path = [ inetutils ];

     
···

       84
       97
        
               User = "riemann";

     

       85
       98
        
               ExecStart = "${launcher}/bin/riemann";

     

       86
       99
        
             };

     

       100
       100
       +
             serviceConfig.LimitNOFILE = 65536;

     

       87
       101
        
           };

     

       88
       102
        
       

     

       89
       103
        
         };