marlowe-prod: Put on marlowe-finance.io

input-output-hk · Sep 23, 2021 · 9bc3106 · 9bc3106
1 parent 4a7e414
commit 9bc3106
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/clusters/plutus/playground/default.nix b/clusters/plutus/playground/default.nix
@@ -56,7 +56,8 @@ in {
     developerGithubTeamNames = [ "plutus" ];
     domain = "plutus.aws.iohkdev.io";
     extraAcmeSANs = [
-      # "*.marlowe-finance.io" # pending DNS change
+      "*.marlowe-finance.io"
+      "marlowe-finance.io"
       "playground.plutus.iohkdev.io"
     ];
     kms =

diff --git a/deploy.cue b/deploy.cue
@@ -63,18 +63,33 @@ Namespace: [Name=_]: {
 		#serverPort:  #portBase + 2
 	}
 	"marlowe-playground": jobDef.#PlutusPlaygroundJob & {
-		#domain:      "marlowe-playground-\(#namespace).\(fqdn)"
+		if #namespace == "prod" {
+			#domain:      "play.marlowe-finance.io"
+		}
+		if #namespace != "prod" {
+			#domain:      "marlowe-playground-\(#namespace).\(fqdn)"
+		}
 		#domainNS:    #namespace
 		#variant:     "marlowe"
 		#clientPort:  #portBase + 3
 		#serverPort:  #portBase + 4
 	}
 	"marlowe-website": jobDef.#MarloweWebsiteJob & {
-		#domain:      "marlowe-website-\(#namespace).\(fqdn)"
+		if #namespace == "prod" {
+			#domain:      "marlowe-finance.io"
+		}
+		if #namespace != "prod" {
+			#domain:      "marlowe-website-\(#namespace).\(fqdn)"
+		}
 		#port: #portBase + 5
 	}
 	"marlowe-run": jobDef.#MarloweRunJob & {
-		#domain:      "marlowe-run-\(#namespace).\(fqdn)"
+		if #namespace == "prod" {
+			#domain:      "run.marlowe-finance.io"
+		}
+		if #namespace != "prod" {
+			#domain:      "marlowe-run-\(#namespace).\(fqdn)"
+		}
 		#portRangeBase:  #portBase + 6
 	}
 }

diff --git a/jobs/marlowe-run.cue b/jobs/marlowe-run.cue
@@ -16,7 +16,7 @@ import (
                 period:  types.#duration
         }
         #portRangeBase: uint
-        #hosts: "`\(#domain)`,`marlowe-run.\(#fqdn)`"
+        #hosts: "`\(#domain)`"
 
         namespace: string
 

diff --git a/jobs/marlowe-website.cue b/jobs/marlowe-website.cue
@@ -15,7 +15,7 @@ import (
 		burst:   uint
 		period:  types.#duration
 	}
-        #hosts: "`\(#domain)`,`marlowe-website.\(#fqdn)`"
+        #hosts: "`\(#domain)`"
         #port: uint
 
 	namespace: string