tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
Fixes #16181 - using bin output for Go services
Kamil Chmielewski
9 years ago
437ea9fd
d2b58dd3
+12
-12
9 changed files
expand all
collapse all
unified
split
nixos
modules
services
misc
confd.nix
etcd.nix
monitoring
bosun.nix
grafana.nix
scollector.nix
networking
consul.nix
skydns.nix
security
hologram.nix
oauth2_proxy.nix
+1
-1
nixos/modules/services/misc/confd.nix
···
75
75
wantedBy = [ "multi-user.target" ];
76
76
after = [ "network.target" ];
77
77
serviceConfig = {
78
78
-
ExecStart = "${cfg.package}/bin/confd";
78
78
+
ExecStart = "${cfg.package.bin}/bin/confd";
79
79
};
80
80
};
81
81
+1
-1
nixos/modules/services/misc/etcd.nix
···
115
115
116
116
serviceConfig = {
117
117
Type = "notify";
118
118
-
ExecStart = "${pkgs.etcd}/bin/etcd";
118
118
+
ExecStart = "${pkgs.etcd.bin}/bin/etcd";
119
119
User = "etcd";
120
120
PermissionsStartOnly = true;
121
121
};
+1
-1
nixos/modules/services/monitoring/bosun.nix
···
148
148
User = cfg.user;
149
149
Group = cfg.group;
150
150
ExecStart = ''
151
151
-
${cfg.package}/bin/bosun -c ${configFile}
151
151
+
${cfg.package.bin}/bin/bosun -c ${configFile}
152
152
'';
153
153
};
154
154
};
+1
-1
nixos/modules/services/monitoring/grafana.nix
···
228
228
after = ["networking.target"];
229
229
environment = mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions;
230
230
serviceConfig = {
231
231
-
ExecStart = "${cfg.package}/bin/grafana-server -homepath ${cfg.dataDir}";
231
231
+
ExecStart = "${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}";
232
232
WorkingDirectory = cfg.dataDir;
233
233
User = "grafana";
234
234
};
+1
-1
nixos/modules/services/monitoring/scollector.nix
···
119
119
PermissionsStartOnly = true;
120
120
User = cfg.user;
121
121
Group = cfg.group;
122
122
-
ExecStart = "${cfg.package}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";
122
122
+
ExecStart = "${cfg.package.bin}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";
123
123
};
124
124
};
125
125
+4
-4
nixos/modules/services/networking/consul.nix
···
178
178
(filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc);
179
179
180
180
serviceConfig = {
181
181
-
ExecStart = "@${cfg.package}/bin/consul consul agent -config-dir /etc/consul.d"
181
181
+
ExecStart = "@${cfg.package.bin}/bin/consul consul agent -config-dir /etc/consul.d"
182
182
+ concatMapStrings (n: " -config-file ${n}") configFiles;
183
183
-
ExecReload = "${cfg.package}/bin/consul reload";
183
183
+
ExecReload = "${cfg.package.bin}/bin/consul reload";
184
184
PermissionsStartOnly = true;
185
185
User = if cfg.dropPrivileges then "consul" else null;
186
186
TimeoutStartSec = "0";
187
187
} // (optionalAttrs (cfg.leaveOnStop) {
188
188
-
ExecStop = "${cfg.package}/bin/consul leave";
188
188
+
ExecStop = "${cfg.package.bin}/bin/consul leave";
189
189
});
190
190
191
191
path = with pkgs; [ iproute gnugrep gawk consul ];
···
236
236
237
237
serviceConfig = {
238
238
ExecStart = ''
239
239
-
${cfg.alerts.package}/bin/consul-alerts start \
239
239
+
${cfg.alerts.package.bin}/bin/consul-alerts start \
240
240
--alert-addr=${cfg.alerts.listenAddr} \
241
241
--consul-addr=${cfg.alerts.consulAddr} \
242
242
${optionalString cfg.alerts.watchChecks "--watch-checks"} \
+1
-1
nixos/modules/services/networking/skydns.nix
···
83
83
SKYDNS_NAMESERVERS = concatStringsSep "," cfg.nameservers;
84
84
};
85
85
serviceConfig = {
86
86
-
ExecStart = "${cfg.package}/bin/skydns";
86
86
+
ExecStart = "${cfg.package.bin}/bin/skydns";
87
87
};
88
88
};
89
89
+1
-1
nixos/modules/services/security/hologram.nix
···
95
95
wantedBy = [ "multi-user.target" ];
96
96
97
97
serviceConfig = {
98
98
-
ExecStart = "${pkgs.hologram}/bin/hologram-server --debug --conf ${cfgFile}";
98
98
+
ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}";
99
99
};
100
100
};
101
101
};
+1
-1
nixos/modules/services/security/oauth2_proxy.nix
···
515
515
serviceConfig = {
516
516
User = "oauth2_proxy";
517
517
Restart = "always";
518
518
-
ExecStart = "${cfg.package}/bin/oauth2_proxy ${mkCommandLine cfg}";
518
518
+
ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${mkCommandLine cfg}";
519
519
};
520
520
};
521
521