metadata topo mods for mainnet

input-output-hk · Feb 24, 2021 · 27719e9 · 27719e9
1 parent 2298b31
commit 27719e9
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 9 deletions.
diff --git a/clusters/cardano.nix b/clusters/cardano.nix
@@ -157,7 +157,7 @@ let
       };
     } def;
   }) // (lib.optionalAttrs globals.withMetadataServer {
-    metadata = let def = (topology.metadataServer or {}); in mkNode {
+    metadata = let def = (topology.metadata or {}); in mkNode {
       deployment.ec2 = {
         region = "eu-central-1";
       };
@@ -167,7 +167,7 @@ let
       ];
       node = {
         roles.isMetadataServer = true;
-        org = "IOHK";
+        org = def.org or "IOHK";
       };
     } def;
   });

diff --git a/globals-defaults.nix b/globals-defaults.nix
@@ -37,7 +37,9 @@ in {
   withFaucet = false;
   withFaucetOptions = {};
   withSmash = false;
+
   withMetadataServer = false;
+  metadataHostName = "tokens.${pkgs.globals.domain}";
 
   initialPythonExplorerDBSyncDone = false;
 

diff --git a/globals-mainnet.nix b/globals-mainnet.nix
@@ -16,6 +16,9 @@ pkgs: {
   withHighLoadRelays = true;
   withSmash = true;
 
+  withMetadataServer = true;
+  metadataHostName = "tokens.cardano.org";
+
   initialPythonExplorerDBSyncDone = true;
 
   environmentName = "mainnet";

diff --git a/modules/cardano-postgres.nix b/modules/cardano-postgres.nix
@@ -18,6 +18,11 @@ in {
         type = types.nullOr types.str;
         default = null;
       };
+      withHighCapacityPostgres = mkOption {
+        description = "Configure postgresql to use additional resources to support high RAM and connection requirements.";
+        type = types.bool;
+        default = globals.withHighCapacityExplorer;
+      };
     };
   };
   config = mkIf cfg.enable {
@@ -27,7 +32,7 @@ in {
       dataDir = mkIf (cfg.postgresqlDataDir != null) cfg.postgresqlDataDir;
       enableTCPIP = false;
     } // (lib.optionalAttrs (!(lib.hasPrefix "20.03"  lib.version)) {
-      settings = if globals.withHighCapacityExplorer then {
+      settings = if cfg.withHighCapacityPostgres then {
         # Optimized for:
         # DB Version: 12
         # OS Type: linux
@@ -86,7 +91,7 @@ in {
         "pg_stat_statements.track" = "all";
       };
     }) // (lib.optionalAttrs (lib.hasPrefix "20.03"  lib.version) {
-      extraConfig = if globals.withHighCapacityExplorer then ''
+      extraConfig = if cfg.withHighCapacityPostgres then ''
         # Optimized for:
         # DB Version: 12
         # OS Type: linux

diff --git a/nix/sources.json b/nix/sources.json
@@ -126,10 +126,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "metadata-server",
-        "rev": "7b89f0ece438cb2639aa3ba3b040aeb9c64e3464",
-        "sha256": "0a2x7qpvfhayiq2wmmgy46041mx8sxg0542y0yfv1f32gfzr6hg1",
+        "rev": "c47ea6c3a4105cfc0bc9003cbe545828bbbb6996",
+        "sha256": "1007s1qaz2djgiszvvn4a0abq7hy29is03fq5i62f4kr9xh2d9yi",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/metadata-server/archive/7b89f0ece438cb2639aa3ba3b040aeb9c64e3464.tar.gz",
+        "url": "https://github.com/input-output-hk/metadata-server/archive/c47ea6c3a4105cfc0bc9003cbe545828bbbb6996.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {

diff --git a/roles/metadata-server.nix b/roles/metadata-server.nix
@@ -65,7 +65,10 @@ in {
       numConnections = config.services.metadata-server.postgres.numConnections;
     };
   };
-  services.cardano-postgres.enable = true;
+  services.cardano-postgres = {
+    enable = true;
+    withHighCapacityPostgres = false;
+  };
   services.postgresql = {
     ensureDatabases = [ "${cfg.postgres.database}" ];
     ensureUsers = [
@@ -175,7 +178,7 @@ in {
     '';
 
     virtualHosts = {
-      "metadata.${globals.domain}" = {
+      "${globals.metadataHostName}" = {
         enableACME = true;
         forceSSL = globals.explorerForceSSL;
         locations =

diff --git a/topologies/mainnet.nix b/topologies/mainnet.nix
@@ -130,4 +130,8 @@ in {
     #TODO: use nginx caching directive instead of upscaling:
     deployment.ec2.instanceType = lib.mkForce "t3a.2xlarge";
   };
+
+  metadata = {
+    node.org = "CF";
+  };
 }