Skip to content

Commit f8d8083

Browse files
committed
Remove mkNomadJobs and config.
1 parent e8b072b commit f8d8083

File tree

1 file changed

+36
-38
lines changed

1 file changed

+36
-38
lines changed

nix/cloud/actions.nix

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -153,46 +153,44 @@
153153
}
154154
'';
155155

156-
job = lib.nix-nomad.mkNomadJobs {
157-
config = {
158-
job.ciceroHandbook = {
159-
namespace = "cicero";
160-
datacenters = [
161-
"dc1"
162-
"eu-central-1"
163-
"us-east-2"
164-
];
165-
group.handbook = {
166-
networks = [{
167-
port.http = {};
168-
}];
169-
services = [{
170-
name = "cicero-handbook";
156+
job = {
157+
job.ciceroHandbook = {
158+
namespace = "cicero";
159+
datacenters = [
160+
"dc1"
161+
"eu-central-1"
162+
"us-east-2"
163+
];
164+
group.handbook = {
165+
networks = [{
166+
port.http = {};
167+
}];
168+
services = [{
169+
name = "cicero-handbook";
170+
port = "http";
171+
tags = [
172+
"ingress"
173+
"traefik.enable=true"
174+
"traefik.http.routers.cicero-handbook.rule=Host(`cicero-handbook.ci.iog.io`) && PathPrefix(`/`)"
175+
"traefik.http.routers.cicero-handbook.entrypoints=https"
176+
"traefik.http.routers.cicero-handbook.middlewares=oauth-auth-redirect@file"
177+
"traefik.http.routers.cicero-handbook.tls=true"
178+
"traefik.http.routers.cicero-handbook.tls.certresolver=acme"
179+
];
180+
checks = [{
181+
type = "tcp";
171182
port = "http";
172-
tags = [
173-
"ingress"
174-
"traefik.enable=true"
175-
"traefik.http.routers.cicero-handbook.rule=Host(`cicero-handbook.ci.iog.io`) && PathPrefix(`/`)"
176-
"traefik.http.routers.cicero-handbook.entrypoints=https"
177-
"traefik.http.routers.cicero-handbook.middlewares=oauth-auth-redirect@file"
178-
"traefik.http.routers.cicero-handbook.tls=true"
179-
"traefik.http.routers.cicero-handbook.tls.certresolver=acme"
180-
];
181-
checks = [{
182-
type = "tcp";
183-
port = "http";
184-
# 10s in nanoseconds
185-
interval = 10000000000;
186-
# 2s in nanoseconds
187-
timeout = 2000000000;
188-
}];
183+
# 10s in nanoseconds
184+
interval = 10000000000;
185+
# 2s in nanoseconds
186+
timeout = 2000000000;
189187
}];
190-
task.handbook = {
191-
driver = "nix";
192-
config = {
193-
packages = [handbook];
194-
command = ["/bin/serve-cicero-handbook"];
195-
};
188+
}];
189+
task.handbook = {
190+
driver = "nix";
191+
config = {
192+
packages = [handbook];
193+
command = ["/bin/serve-cicero-handbook"];
196194
};
197195
};
198196
};

0 commit comments

Comments
 (0)