Page MenuHomePhabricator
Files F3004955

D13103.diff
No OneTemporary
Actions

D13103.diff
View Options

diff --git a/services/terraform/self-host/keyserver_cluster.tf b/services/terraform/self-host/keyserver_cluster.tf
--- a/services/terraform/self-host/keyserver_cluster.tf
+++ b/services/terraform/self-host/keyserver_cluster.tf
@@ -1,10 +1,3 @@
-locals {
- keyserver_service_image_tag = "1.0.105"
- 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
@@ -42,7 +42,7 @@
container_definitions = jsonencode([
{
name = local.keyserver_primary_container_name
- image = local.keyserver_service_server_image
+ image = var.keyserver_image
essential = true
portMappings = [
{
diff --git a/services/terraform/self-host/keyserver_secondary.tf b/services/terraform/self-host/keyserver_secondary.tf
--- a/services/terraform/self-host/keyserver_secondary.tf
+++ b/services/terraform/self-host/keyserver_secondary.tf
@@ -38,7 +38,7 @@
container_definitions = jsonencode([
{
name = local.keyserver_secondary_container_name
- image = local.keyserver_service_server_image
+ image = var.keyserver_image
essential = true
portMappings = [
{
diff --git a/services/terraform/self-host/landing.tf b/services/terraform/self-host/landing.tf
--- a/services/terraform/self-host/landing.tf
+++ b/services/terraform/self-host/landing.tf
@@ -19,7 +19,7 @@
count = var.enable_landing_service ? 1 : 0
container_name = "landing"
- image = local.keyserver_service_server_image
+ image = var.keyserver_image
service_name = "landing"
cluster_id = aws_ecs_cluster.keyserver_cluster.id
domain_name = var.landing_domain_name
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
@@ -1,3 +1,9 @@
+variable "keyserver_image" {
+ description = "Keyserver image"
+ type = string
+ default = "commapp/keyserver:1.0.105"
+}
+
variable "keyserver_domain_name" {
description = "Domain name for your keyserver"
type = string
@@ -43,12 +49,6 @@
default = 1
}
-variable "custom_keyserver_image" {
- description = "Specify custom keyserver image. Should be reserved for development purposes"
- type = string
- default = null
-}
-
# Web app
variable "enable_webapp_service" {
diff --git a/services/terraform/self-host/webapp.tf b/services/terraform/self-host/webapp.tf
--- a/services/terraform/self-host/webapp.tf
+++ b/services/terraform/self-host/webapp.tf
@@ -19,7 +19,7 @@
count = var.enable_webapp_service ? 1 : 0
container_name = "webapp"
- image = local.keyserver_service_server_image
+ image = var.keyserver_image
service_name = "webapp"
cluster_id = aws_ecs_cluster.keyserver_cluster.id
domain_name = var.webapp_domain_name

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 19, 3:21 PM (21 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2323629
Default Alt Text
D13103.diff (3 KB)

Event Timeline