Dragon config fixes

3 files changed, 14 insertions, 16 deletions

diff --git a/config/web-server.nix b/config/web-server.nix
index 767d7f9..48f8f01 100644
--- a/config/web-server.nix
+++ b/config/web-server.nix
@@ -2,7 +2,6 @@
 let
   aliases = import ../data/aliases.nix;
   keycloak_loc = aliases.services.keycloak;
-  bridge_loc = aliases.services.bridge;
 in {
   security.acme.acceptTerms = true;
   security.acme.defaults.email = "kj@orbekk.com";
@@ -43,7 +42,6 @@ in {
         forceSSL = true;
       };
     in {
-      "tommvo.com" = template // { root = "/storage/srv/tommvo.com"; };
       "orbekk.no" = template // { root = "/storage/srv/orbekk.com"; };
       "orbekk.com" = template // { root = "/storage/srv/orbekk.com"; };
       "wifi.orbekk.com" = template // {
@@ -72,9 +70,6 @@ in {
       "auth.orbekk.com" = template // {
         locations."/".proxyPass = "http://localhost:${toString keycloak_loc.http-port}";
       };
-      "bridge.orbekk.com" = template // {
-        locations."/".proxyPass = "http://${bridge_loc.host}:${toString bridge_loc.port}";
-      };
       "git.orbekk.com" = template // {
         locations."/".proxyPass = "http://localhost:11103";
       };
diff --git a/data/aliases.nix b/data/aliases.nix
index 699e2c7..e04aad7 100644
--- a/data/aliases.nix
+++ b/data/aliases.nix
@@ -44,14 +44,6 @@ rec {
       address = ip.dragon;
       port = 11109;
     };
-    bridge = {
-      address = ip.dragon;
-      port = 11110;
-    };
-    bridge_nightly = {
-      address = ip.dragon;
-      port = 11110;
-    };
     grafana = { port = 11111; };
     prometheus = { port = 11112; };
     prometheus-exporter = { port = 11113; };
@@ -59,6 +51,13 @@ rec {
     hledger-web = { port = 11116; };
     prometheus-pms7003-exporter = { host = "172.20.100.10"; port = 11117; };
     keycloak = { http-port = 11118; https-port = 11119; };
-    bridge = { host = "pincer.nyc.orbekk.com"; port = 11120; };
+    bridge = {
+      address = ip.dragon;
+      port = 11121;
+    };
+    bridge_nightly = {
+      address = ip.dragon;
+      port = 11122;
+    };
   };
 }
diff --git a/modules/bridge.nix b/modules/bridge.nix
index efc4b92..65cec15 100644
--- a/modules/bridge.nix
+++ b/modules/bridge.nix
@@ -17,13 +17,13 @@ with lib;
   };
 
   config = mkIf cfg.enable {
-    services.bridge-nightly = {
+    systemd.services.bridge-nightly = {
       description = "Bridge Nightly backend";
       wantedBy = ["multi-user.target"];
       after = ["network.target"];
 
       environment = {
-        BIND_ADDRESS = "[::]:${cfg.port}";
+        BIND_ADDRESS = "[::]:${toString cfg.port}";
         RUST_BACKTRACE = "1";
         AUTHENTICATOR = "oauth";
         OPENID_ISSUER_URL= "https://auth.orbekk.com/realms/test";
@@ -40,6 +40,10 @@ with lib;
       };
     };
 
+      # "bridge.orbekk.com" = template // {
+      #   locations."/".proxyPass = "http://${bridge_loc.host}:${toString bridge_loc.port}";
+      # };
+
     services.postgresql = {
       enable = true;
       enableTCPIP = true;