Skip to content

Commit 08670c8

Browse files
classabbyampthe-maldridge
classabbyamp
authored and
the-maldridge
committed
services/nomad/**: nomad fmt
1 parent 720cb5f commit 08670c8

40 files changed

+522
-522
lines changed

‎services/nomad/apps/alps.nomad‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
job "alps" {
22
datacenters = ["VOID"]
3-
namespace = "apps-restricted"
4-
type = "service"
3+
namespace = "apps-restricted"
4+
type = "service"
55

66
group "app" {
77
count = 1
@@ -16,7 +16,7 @@ job "alps" {
1616
port = "http"
1717
meta {
1818
nginx_enable = "true"
19-
nginx_names = "alps.s.voidlinux.org alps.voidlinux.org"
19+
nginx_names = "alps.s.voidlinux.org alps.voidlinux.org"
2020
}
2121
}
2222

@@ -25,7 +25,7 @@ job "alps" {
2525

2626
config {
2727
image = "ghcr.io/void-linux/infra-alps:9cb23b09"
28-
args = ["imaps://mx1.voidlinux.org:993", "smtps://mx1.voidlinux.org:465"]
28+
args = ["imaps://mx1.voidlinux.org:993", "smtps://mx1.voidlinux.org:465"]
2929
}
3030
}
3131
}

‎services/nomad/apps/debuginfod.nomad‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
job "debuginfod" {
22
datacenters = ["VOID"]
3-
namespace = "apps"
4-
type = "service"
3+
namespace = "apps"
4+
type = "service"
55

66
group "app" {
77
count = 1
88

99
volume "binpkgs" {
10-
type = "host"
10+
type = "host"
1111
read_only = true
12-
source = "root-pkgs"
12+
source = "root-pkgs"
1313
}
1414

1515
volume "debuginfod" {
16-
type = "host"
16+
type = "host"
1717
read_only = false
18-
source = "debuginfod-data"
18+
source = "debuginfod-data"
1919
}
2020

2121
network {
@@ -30,31 +30,31 @@ job "debuginfod" {
3030
port = "http"
3131
meta {
3232
nginx_enable = "true"
33-
nginx_names = "debuginfod.s.voidlinux.org debuginfod.voidlinux.org"
33+
nginx_names = "debuginfod.s.voidlinux.org debuginfod.voidlinux.org"
3434
}
3535

3636
check {
37-
type = "http"
37+
type = "http"
3838
address_mode = "host"
39-
path = "/metrics"
40-
timeout = "30s"
41-
interval = "15s"
39+
path = "/metrics"
40+
timeout = "30s"
41+
interval = "15s"
4242
}
4343
}
4444

4545
task "debuginfod" {
4646
driver = "docker"
4747

4848
volume_mount {
49-
volume = "binpkgs"
49+
volume = "binpkgs"
5050
destination = "/binpkgs"
51-
read_only = true
51+
read_only = true
5252
}
5353

5454
volume_mount {
55-
volume = "debuginfod"
55+
volume = "debuginfod"
5656
destination = "/debuginfod"
57-
read_only = false
57+
read_only = false
5858
}
5959

6060
config {
@@ -73,12 +73,12 @@ job "debuginfod" {
7373

7474
resources {
7575
memory = 8000
76-
cpu = 6000
76+
cpu = 6000
7777
}
7878

7979
restart {
8080
attempts = 100
81-
delay = "30s"
81+
delay = "30s"
8282
}
8383
}
8484
}

‎services/nomad/apps/devspace.nomad‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
job "devspace" {
22
datacenters = ["VOID-MIRROR"]
3-
namespace = "apps"
4-
type = "service"
3+
namespace = "apps"
4+
type = "service"
55

66
group "sftpgo" {
77
count = 1
88

99
volume "devspace_data" {
10-
type = "host"
10+
type = "host"
1111
read_only = false
12-
source = "devspace_data"
12+
source = "devspace_data"
1313
}
1414

1515
volume "netauth_config" {
16-
type = "host"
16+
type = "host"
1717
read_only = true
18-
source = "netauth_config"
18+
source = "netauth_config"
1919
}
2020

2121
network {
@@ -31,13 +31,13 @@ job "devspace" {
3131
port = "http"
3232
meta {
3333
nginx_enable = "true"
34-
nginx_names = "devspace-sftp.voidlinux.org"
34+
nginx_names = "devspace-sftp.voidlinux.org"
3535
}
3636
check {
37-
type = "http"
38-
port = 8081
39-
path = "/healthz"
40-
timeout = "1s"
37+
type = "http"
38+
port = 8081
39+
path = "/healthz"
40+
timeout = "1s"
4141
interval = "30s"
4242
}
4343
}
@@ -46,39 +46,39 @@ job "devspace" {
4646
driver = "docker"
4747

4848
volume_mount {
49-
volume = "devspace_data"
49+
volume = "devspace_data"
5050
destination = "/data"
51-
read_only = false
51+
read_only = false
5252
}
5353

5454
volume_mount {
55-
volume = "netauth_config"
55+
volume = "netauth_config"
5656
destination = "/etc/netauth"
57-
read_only = true
57+
read_only = true
5858
}
5959

6060
config {
61-
image = "ghcr.io/void-linux/infra-sftpgo:20241231R1"
61+
image = "ghcr.io/void-linux/infra-sftpgo:20241231R1"
6262
network_mode = "host"
6363
}
6464

6565
env {
66-
SFTPGO_HTTPD__BINDINGS__0__PORT = "${NOMAD_PORT_http}"
67-
SFTPGO_HTTPD__TEMPLATES_PATH = "/usr/share/sftpgo/templates"
68-
SFTPGO_HTTPD__STATIC_FILES_PATH = "/usr/share/sftpgo/static"
69-
SFTPGO_SFTPD__HOST_KEYS = "/secrets/id_rsa,/secrets/id_ecdsa,/secrets/id_ed25519"
70-
SFTPGO_TELEMETRY__BIND_PORT = "8081"
71-
SFTPGO_TELEMETRY__BIND_ADDRESS = ""
72-
SFTPGO_DATA_PROVIDER__DRIVER = "sqlite"
73-
SFTPGO_DATA_PROVIDER__NAME = "/data/sftpgo.db"
66+
SFTPGO_HTTPD__BINDINGS__0__PORT = "${NOMAD_PORT_http}"
67+
SFTPGO_HTTPD__TEMPLATES_PATH = "/usr/share/sftpgo/templates"
68+
SFTPGO_HTTPD__STATIC_FILES_PATH = "/usr/share/sftpgo/static"
69+
SFTPGO_SFTPD__HOST_KEYS = "/secrets/id_rsa,/secrets/id_ecdsa,/secrets/id_ed25519"
70+
SFTPGO_TELEMETRY__BIND_PORT = "8081"
71+
SFTPGO_TELEMETRY__BIND_ADDRESS = ""
72+
SFTPGO_DATA_PROVIDER__DRIVER = "sqlite"
73+
SFTPGO_DATA_PROVIDER__NAME = "/data/sftpgo.db"
7474
SFTPGO_DATA_PROVIDER__EXTERNAL_AUTH_HOOK = "/usr/libexec/sftpgo/netauth-hook"
75-
SFTPGO_COMMAND__COMMANDS__0__PATH = "/usr/libexec/sftpgo/netauth-hook"
76-
SFTPGO_COMMAND__COMMANDS__0__ENV = "SFTPGO_NETAUTH_REQUIREGROUP=devspace-users,SFTPGO_NETAUTH_HOMEDIR=/data/home"
77-
SFTPGO_COMMAND__COMMANDS__0__HOOK = "external_auth"
75+
SFTPGO_COMMAND__COMMANDS__0__PATH = "/usr/libexec/sftpgo/netauth-hook"
76+
SFTPGO_COMMAND__COMMANDS__0__ENV = "SFTPGO_NETAUTH_REQUIREGROUP=devspace-users,SFTPGO_NETAUTH_HOMEDIR=/data/home"
77+
SFTPGO_COMMAND__COMMANDS__0__HOOK = "external_auth"
7878
}
7979

8080
template {
81-
data = <<EOF
81+
data = <<EOF
8282
{{- with nomadVar "nomad/jobs/devspace" -}}
8383
{{ .ssh_host_rsa_key }}
8484
{{- end -}}
@@ -87,7 +87,7 @@ EOF
8787
}
8888

8989
template {
90-
data = <<EOF
90+
data = <<EOF
9191
{{- with nomadVar "nomad/jobs/devspace" -}}
9292
{{ .ssh_host_ed25519_key }}
9393
{{- end -}}
@@ -96,7 +96,7 @@ EOF
9696
}
9797

9898
template {
99-
data = <<EOF
99+
data = <<EOF
100100
{{- with nomadVar "nomad/jobs/devspace" -}}
101101
{{ .ssh_host_ecdsa_key }}
102102
{{- end -}}
@@ -110,9 +110,9 @@ EOF
110110
count = 1
111111

112112
volume "devspace_home" {
113-
type = "host"
113+
type = "host"
114114
read_only = true
115-
source = "devspace_home"
115+
source = "devspace_home"
116116
}
117117

118118
network {
@@ -125,15 +125,15 @@ EOF
125125
port = "http"
126126
meta {
127127
nginx_enable = "true"
128-
nginx_names = "devspace.voidlinux.org"
128+
nginx_names = "devspace.voidlinux.org"
129129
}
130130
}
131131

132132
task "nginx" {
133133
driver = "docker"
134134

135135
volume_mount {
136-
volume = "devspace_home"
136+
volume = "devspace_home"
137137
destination = "/srv/www"
138138
}
139139

@@ -142,7 +142,7 @@ EOF
142142
}
143143

144144
template {
145-
data = <<EOF
145+
data = <<EOF
146146
server {
147147
server_name devspace;
148148
listen 0.0.0.0:80 default_server;

‎services/nomad/apps/etherpad.nomad‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
job "etherpad" {
2-
type = "service"
2+
type = "service"
33
datacenters = ["VOID"]
4-
namespace = "apps"
4+
namespace = "apps"
55

66
group "etherpad" {
77
network {
@@ -14,14 +14,14 @@ job "etherpad" {
1414
port = "http"
1515
meta {
1616
nginx_enable = "true"
17-
nginx_names = "pad.voidlinux.org"
17+
nginx_names = "pad.voidlinux.org"
1818
}
1919
}
2020

2121
volume "etherpad" {
22-
type = "host"
22+
type = "host"
2323
read_only = false
24-
source = "etherpad-data"
24+
source = "etherpad-data"
2525
}
2626

2727
task "app" {
@@ -32,15 +32,15 @@ job "etherpad" {
3232
}
3333

3434
env {
35-
DB_FILENAME="/data/db.json"
36-
SUPPRESS_ERRORS_IN_PAD_TEXT="false"
37-
TRUST_PROXY="true"
35+
DB_FILENAME = "/data/db.json"
36+
SUPPRESS_ERRORS_IN_PAD_TEXT = "false"
37+
TRUST_PROXY = "true"
3838
}
3939

4040
volume_mount {
41-
volume = "etherpad"
41+
volume = "etherpad"
4242
destination = "/data"
43-
read_only = false
43+
read_only = false
4444
}
4545
}
4646
}

‎services/nomad/apps/feediverse.nomad‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
job "feediverse" {
2-
type = "service"
2+
type = "service"
33
datacenters = ["VOID"]
4-
namespace = "apps"
4+
namespace = "apps"
55

66
group "feediverse" {
77
network {
@@ -10,8 +10,8 @@ job "feediverse" {
1010

1111
ephemeral_disk {
1212
migrate = true
13-
size = 200
14-
sticky = true
13+
size = 200
14+
sticky = true
1515
}
1616

1717
task "app" {
@@ -22,14 +22,14 @@ job "feediverse" {
2222
}
2323

2424
env {
25-
VERBOSE = 1
25+
VERBOSE = 1
2626
CONFIG_FILE = "/secrets/config.yaml"
27-
STATE_FILE = "/alloc/data/state.json"
28-
DEDUPE = "url"
27+
STATE_FILE = "/alloc/data/state.json"
28+
DEDUPE = "url"
2929
}
3030

3131
template {
32-
data = <<EOT
32+
data = <<EOT
3333
{{- with nomadVar "nomad/jobs/feediverse" }}
3434
access_token: "{{ .access_token }}"
3535
client_id: "{{ .client_id }}"

‎services/nomad/apps/infradocs.nomad‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
job "infradocs" {
22
datacenters = ["VOID"]
3-
namespace = "apps"
4-
type = "service"
3+
namespace = "apps"
4+
type = "service"
55

66
group "app" {
77
count = 1
@@ -18,15 +18,15 @@ job "infradocs" {
1818
port = "http"
1919
meta {
2020
nginx_enable = "true"
21-
nginx_names = "infradocs.voidlinux.org"
21+
nginx_names = "infradocs.voidlinux.org"
2222
}
2323

2424
check {
25-
type = "http"
25+
type = "http"
2626
address_mode = "host"
27-
path = "/"
28-
timeout = "30s"
29-
interval = "15s"
27+
path = "/"
28+
timeout = "30s"
29+
interval = "15s"
3030
}
3131
}
3232

0 commit comments

Comments
 (0)