Reintroduce draupnir

4 files changed, 10 insertions, 22 deletions

diff --git a/host/Rory-ovh/configuration.nix b/host/Rory-ovh/configuration.nix

index 691f4e3..158d970 100755
--- a/host/Rory-ovh/configuration.nix
+++ b/host/Rory-ovh/configuration.nix
@@ -23,6 +23,7 @@
     ./services/cgit.nix
     ./services/postgres.nix
     ./services/matrix/synapse/synapse-main.nix
+    ./services/matrix/draupnir.nix
   ];
 
   users.groups.ocp = { };
@@ -70,12 +71,12 @@
 
   environment.memoryAllocator.provider = "jemalloc";
   
-  #containers."draupnir-cme" = import ./services/containers/draupnir-cme/container.nix {
-  #  inherit pkgs lib nixpkgs-Draupnir;
-  #};
-  #containers."draupnir-fedora" = import ./services/containers/draupnir-fedora/container.nix {
-  #  inherit pkgs lib nixpkgs-Draupnir;
-  #};
+  containers."draupnir-cme" = import ./services/containers/draupnir-cme/container.nix {
+    inherit pkgs lib nixpkgs-Draupnir;
+  };
+  containers."draupnir-fedora" = import ./services/containers/draupnir-fedora/container.nix {
+    inherit pkgs lib nixpkgs-Draupnir;
+  };
 
   system.stateVersion = "22.11"; # DO NOT EDIT!
 
diff --git a/host/Rory-ovh/services/containers/draupnir-cme/container.nix b/host/Rory-ovh/services/containers/draupnir-cme/container.nix

index 7b87264..ec85e2f 100755
--- a/host/Rory-ovh/services/containers/draupnir-cme/container.nix
+++ b/host/Rory-ovh/services/containers/draupnir-cme/container.nix
@@ -25,7 +25,7 @@
   localAddress = "192.168.100.17";
 
   bindMounts."draupnir-access-token" = {
-    hostPath = "/etc/draupnir-cme-access-token";
+    hostPath = "/data/secrets/draupnir-cme-access-token";
     mountPoint = "/etc/draupnir-access-token";
     isReadOnly = true;
   };
diff --git a/host/Rory-ovh/services/containers/draupnir-fedora/container.nix b/host/Rory-ovh/services/containers/draupnir-fedora/container.nix

index 82683d7..2d0f8d1 100644
--- a/host/Rory-ovh/services/containers/draupnir-fedora/container.nix
+++ b/host/Rory-ovh/services/containers/draupnir-fedora/container.nix
@@ -25,7 +25,7 @@
   localAddress = "192.168.100.18";
 
   bindMounts."draupnir-access-token" = {
-    hostPath = "/etc/draupnir-fedora-access-token";
+    hostPath = "/data/secrets/draupnir-fedora-access-token";
     mountPoint = "/etc/draupnir-access-token";
     isReadOnly = true;
   };
diff --git a/host/Rory-ovh/services/matrix/draupnir.nix b/host/Rory-ovh/services/matrix/draupnir.nix

index 40d1489..ce74445 100755
--- a/host/Rory-ovh/services/matrix/draupnir.nix
+++ b/host/Rory-ovh/services/matrix/draupnir.nix
@@ -2,24 +2,11 @@
 
 {
   services.draupnir = {
-    #package = (pkgs.draupnir.overrideAttrs (oldAttrs: {
-    #  src = draupnirSrc;
-    #  version = draupnirSrc.rev;
-    #}));
 
     enable = true;
     homeserverUrl = "https://matrix.rory.gay";
-    accessTokenFile = "/etc/draupnir-access-token";
+    accessTokenFile = "/data/secrets/draupnir-access-token";
 
-    #pantalaimon = {
-    #  enable = false;
-    #  username = "draupnir";
-    #  passwordFile = "/etc/draupnir-password";
-    #  options = {
-    #homeserver = "http://localhost:8008";
-    #ssl = false;
-    #  };
-    #};
     settings = {
       managementRoom = "#draupnir-mgmt:rory.gay";
       verboseLogging = false;