commit 437ea9fd370f85451801ae5904a364175ce4eef8 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/misc/confd.nix

···

       75
        
             wantedBy = [ "multi-user.target" ];

     

       76
        
             after = [ "network.target" ];

     

       77
        
             serviceConfig = {

     

       78
       -
               ExecStart = "${cfg.package}/bin/confd";

     

       79
        
             };

     

       80
        
           };

     

       81

···

       75
        
             wantedBy = [ "multi-user.target" ];

     

       76
        
             after = [ "network.target" ];

     

       77
        
             serviceConfig = {

     

       78
       +
               ExecStart = "${cfg.package.bin}/bin/confd";

     

       79
        
             };

     

       80
        
           };

     

       81

+1 -1

nixos/modules/services/misc/etcd.nix

···

       115
        
       

     

       116
        
             serviceConfig = {

     

       117
        
               Type = "notify";

     

       118
       -
               ExecStart = "${pkgs.etcd}/bin/etcd";

     

       119
        
               User = "etcd";

     

       120
        
               PermissionsStartOnly = true;

     

       121
        
             };

···

       115
        
       

     

       116
        
             serviceConfig = {

     

       117
        
               Type = "notify";

     

       118
       +
               ExecStart = "${pkgs.etcd.bin}/bin/etcd";

     

       119
        
               User = "etcd";

     

       120
        
               PermissionsStartOnly = true;

     

       121
        
             };

+1 -1

nixos/modules/services/monitoring/bosun.nix

···

       148
        
               User = cfg.user;

     

       149
        
               Group = cfg.group;

     

       150
        
               ExecStart = ''

     

       151
       -
                 ${cfg.package}/bin/bosun -c ${configFile}

     

       152
        
               '';

     

       153
        
             };

     

       154
        
           };

···

       148
        
               User = cfg.user;

     

       149
        
               Group = cfg.group;

     

       150
        
               ExecStart = ''

     

       151
       +
                 ${cfg.package.bin}/bin/bosun -c ${configFile}

     

       152
        
               '';

     

       153
        
             };

     

       154
        
           };

+1 -1

nixos/modules/services/monitoring/grafana.nix

···

       228
        
             after = ["networking.target"];

     

       229
        
             environment = mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions;

     

       230
        
             serviceConfig = {

     

       231
       -
               ExecStart = "${cfg.package}/bin/grafana-server -homepath ${cfg.dataDir}";

     

       232
        
               WorkingDirectory = cfg.dataDir;

     

       233
        
               User = "grafana";

     

       234
        
             };

···

       228
        
             after = ["networking.target"];

     

       229
        
             environment = mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions;

     

       230
        
             serviceConfig = {

     

       231
       +
               ExecStart = "${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}";

     

       232
        
               WorkingDirectory = cfg.dataDir;

     

       233
        
               User = "grafana";

     

       234
        
             };

+1 -1

nixos/modules/services/monitoring/scollector.nix

···

       119
        
               PermissionsStartOnly = true;

     

       120
        
               User = cfg.user;

     

       121
        
               Group = cfg.group;

     

       122
       -
               ExecStart = "${cfg.package}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";

     

       123
        
             };

     

       124
        
           };

     

       125

···

       119
        
               PermissionsStartOnly = true;

     

       120
        
               User = cfg.user;

     

       121
        
               Group = cfg.group;

     

       122
       +
               ExecStart = "${cfg.package.bin}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";

     

       123
        
             };

     

       124
        
           };

     

       125

+4 -4

nixos/modules/services/networking/consul.nix

···

       178
        
                   (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc);

     

       179
        
       

     

       180
        
               serviceConfig = {

     

       181
       -
                 ExecStart = "@${cfg.package}/bin/consul consul agent -config-dir /etc/consul.d"

     

       182
        
                   + concatMapStrings (n: " -config-file ${n}") configFiles;

     

       183
       -
                 ExecReload = "${cfg.package}/bin/consul reload";

     

       184
        
                 PermissionsStartOnly = true;

     

       185
        
                 User = if cfg.dropPrivileges then "consul" else null;

     

       186
        
                 TimeoutStartSec = "0";

     

       187
        
               } // (optionalAttrs (cfg.leaveOnStop) {

     

       188
       -
                 ExecStop = "${cfg.package}/bin/consul leave";

     

       189
        
               });

     

       190
        
       

     

       191
        
               path = with pkgs; [ iproute gnugrep gawk consul ];

     
···

       236
        
       

     

       237
        
               serviceConfig = {

     

       238
        
                 ExecStart = ''

     

       239
       -
                   ${cfg.alerts.package}/bin/consul-alerts start \

     

       240
        
                     --alert-addr=${cfg.alerts.listenAddr} \

     

       241
        
                     --consul-addr=${cfg.alerts.consulAddr} \

     

       242
        
                     ${optionalString cfg.alerts.watchChecks "--watch-checks"} \

···

       178
        
                   (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc);

     

       179
        
       

     

       180
        
               serviceConfig = {

     

       181
       +
                 ExecStart = "@${cfg.package.bin}/bin/consul consul agent -config-dir /etc/consul.d"

     

       182
        
                   + concatMapStrings (n: " -config-file ${n}") configFiles;

     

       183
       +
                 ExecReload = "${cfg.package.bin}/bin/consul reload";

     

       184
        
                 PermissionsStartOnly = true;

     

       185
        
                 User = if cfg.dropPrivileges then "consul" else null;

     

       186
        
                 TimeoutStartSec = "0";

     

       187
        
               } // (optionalAttrs (cfg.leaveOnStop) {

     

       188
       +
                 ExecStop = "${cfg.package.bin}/bin/consul leave";

     

       189
        
               });

     

       190
        
       

     

       191
        
               path = with pkgs; [ iproute gnugrep gawk consul ];

     
···

       236
        
       

     

       237
        
               serviceConfig = {

     

       238
        
                 ExecStart = ''

     

       239
       +
                   ${cfg.alerts.package.bin}/bin/consul-alerts start \

     

       240
        
                     --alert-addr=${cfg.alerts.listenAddr} \

     

       241
        
                     --consul-addr=${cfg.alerts.consulAddr} \

     

       242
        
                     ${optionalString cfg.alerts.watchChecks "--watch-checks"} \

+1 -1

nixos/modules/services/networking/skydns.nix

···

       83
        
               SKYDNS_NAMESERVERS = concatStringsSep "," cfg.nameservers;

     

       84
        
             };

     

       85
        
             serviceConfig = {

     

       86
       -
               ExecStart = "${cfg.package}/bin/skydns";

     

       87
        
             };

     

       88
        
           };

     

       89

···

       83
        
               SKYDNS_NAMESERVERS = concatStringsSep "," cfg.nameservers;

     

       84
        
             };

     

       85
        
             serviceConfig = {

     

       86
       +
               ExecStart = "${cfg.package.bin}/bin/skydns";

     

       87
        
             };

     

       88
        
           };

     

       89

+1 -1

nixos/modules/services/security/hologram.nix

···

       95
        
             wantedBy    = [ "multi-user.target" ];

     

       96
        
       

     

       97
        
             serviceConfig = {

     

       98
       -
               ExecStart = "${pkgs.hologram}/bin/hologram-server --debug --conf ${cfgFile}";

     

       99
        
             };

     

       100
        
           };

     

       101
        
         };

···

       95
        
             wantedBy    = [ "multi-user.target" ];

     

       96
        
       

     

       97
        
             serviceConfig = {

     

       98
       +
               ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}";

     

       99
        
             };

     

       100
        
           };

     

       101
        
         };

+1 -1

nixos/modules/services/security/oauth2_proxy.nix

···

       515
        
             serviceConfig = {

     

       516
        
               User = "oauth2_proxy";

     

       517
        
               Restart = "always";

     

       518
       -
               ExecStart = "${cfg.package}/bin/oauth2_proxy ${mkCommandLine cfg}";

     

       519
        
             };

     

       520
        
           };

     

       521

···

       515
        
             serviceConfig = {

     

       516
        
               User = "oauth2_proxy";

     

       517
        
               Restart = "always";

     

       518
       +
               ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${mkCommandLine cfg}";

     

       519
        
             };

     

       520
        
           };

     

       521