woodpecker-grpc: fix tls certificate and increase nginx timeout
This commit is contained in:
parent
19a8069f19
commit
27e7a6b179
1 changed files with 9 additions and 3 deletions
|
@ -93,6 +93,10 @@ EOH
|
||||||
name = "woodpecker-grpc"
|
name = "woodpecker-grpc"
|
||||||
tags = [
|
tags = [
|
||||||
"woodpecker-grpc",
|
"woodpecker-grpc",
|
||||||
|
# The tricot tag is necessary for tricot to get us a tls certificate,
|
||||||
|
# but it will not make the grpc endpoint work as tricot cannot
|
||||||
|
# proxy grpc traffic by itself.
|
||||||
|
"tricot woodpecker-grpc.deuxfleurs.fr",
|
||||||
]
|
]
|
||||||
port = "grpc_port"
|
port = "grpc_port"
|
||||||
address_mode = "host"
|
address_mode = "host"
|
||||||
|
@ -120,7 +124,7 @@ http {
|
||||||
listen 0.0.0.0:14453 ssl;
|
listen 0.0.0.0:14453 ssl;
|
||||||
listen [::]:14453 ssl;
|
listen [::]:14453 ssl;
|
||||||
http2 on;
|
http2 on;
|
||||||
server_name woodpecker.deuxfleurs.fr;
|
server_name woodpecker-grpc.deuxfleurs.fr;
|
||||||
resolver 127.0.0.1 valid=30s;
|
resolver 127.0.0.1 valid=30s;
|
||||||
|
|
||||||
ssl_certificate "/etc/ssl/certs/woodpecker.cert";
|
ssl_certificate "/etc/ssl/certs/woodpecker.cert";
|
||||||
|
@ -128,6 +132,8 @@ http {
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
grpc_pass grpc://woodpecker-grpc.service.prod.consul:14090;
|
grpc_pass grpc://woodpecker-grpc.service.prod.consul:14090;
|
||||||
|
grpc_read_timeout 1800s;
|
||||||
|
grpc_send_timeout 1800s;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -136,11 +142,11 @@ EOH
|
||||||
}
|
}
|
||||||
|
|
||||||
template {
|
template {
|
||||||
data = "{{ with $d := key \"tricot/certs/woodpecker.deuxfleurs.fr\" | parseJSON }}{{ $d.key_pem }}{{ end }}"
|
data = "{{ with $d := key \"tricot/certs/woodpecker-grpc.deuxfleurs.fr\" | parseJSON }}{{ $d.key_pem }}{{ end }}"
|
||||||
destination = "secrets/ssl/certs/woodpecker.key"
|
destination = "secrets/ssl/certs/woodpecker.key"
|
||||||
}
|
}
|
||||||
template {
|
template {
|
||||||
data = "{{ with $d := key \"tricot/certs/woodpecker.deuxfleurs.fr\" | parseJSON }}{{ $d.cert_pem }}{{ end }}"
|
data = "{{ with $d := key \"tricot/certs/woodpecker-grpc.deuxfleurs.fr\" | parseJSON }}{{ $d.cert_pem }}{{ end }}"
|
||||||
destination = "secrets/ssl/certs/woodpecker.cert"
|
destination = "secrets/ssl/certs/woodpecker.cert"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue