Page MenuHomePhabricator
Files F3349846

D12863.id42720.diff
No OneTemporary
Actions

D12863.id42720.diff
View Options

diff --git a/services/terraform/self-host/aws_ecs.tf b/services/terraform/self-host/aws_ecs.tf
--- a/services/terraform/self-host/aws_ecs.tf
+++ b/services/terraform/self-host/aws_ecs.tf
@@ -1,3 +1,10 @@
+locals {
+ keyserver_service_image_tag = "1.0.101"
+ keyserver_service_server_image = (var.custom_keyserver_image != null ?
+ var.custom_keyserver_image :
+ "commapp/keyserver:${local.keyserver_service_image_tag}")
+}
+
resource "aws_ecs_cluster" "keyserver_cluster" {
# Do not change without replacing cluster_name in aws-deploy.sh
name = "keyserver-cluster"
diff --git a/services/terraform/self-host/keyserver_primary.tf b/services/terraform/self-host/keyserver_primary.tf
--- a/services/terraform/self-host/keyserver_primary.tf
+++ b/services/terraform/self-host/keyserver_primary.tf
@@ -1,6 +1,4 @@
locals {
- keyserver_service_image_tag = "1.0.101"
- keyserver_service_server_image = "commapp/keyserver:${local.keyserver_service_image_tag}"
keyserver_primary_container_name = "keyserver-primary"
keyserver_run_server_config = jsonencode({
diff --git a/services/terraform/self-host/variables.tf b/services/terraform/self-host/variables.tf
--- a/services/terraform/self-host/variables.tf
+++ b/services/terraform/self-host/variables.tf
@@ -51,3 +51,9 @@
type = number
default = 1
}
+
+variable "custom_keyserver_image" {
+ description = "Specify custom keyserver image. Should be reserved for development purposes"
+ type = string
+ default = null
+}

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 23, 7:30 PM (16 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2572200
Default Alt Text
D12863.id42720.diff (1 KB)

Event Timeline