diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix
index 9448569..85709d8 100644
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -5,7 +5,6 @@
grapevine,
conduit,
conduwuit,
- nixpkgs-Draupnir,
...
}:
diff --git a/host/Rory-nginx/services/matrix/root.nix b/host/Rory-nginx/services/matrix/root.nix
index 5bb3915..22a9517 100644
--- a/host/Rory-nginx/services/matrix/root.nix
+++ b/host/Rory-nginx/services/matrix/root.nix
@@ -5,7 +5,7 @@
./synapse/synapse-main.nix
./coturn.nix
./matrix-appservice-discord.nix
- ./draupnir.nix
+ #./draupnir.nix
./grapevine.nix
# ./sliding-sync.nix # removed from nixpkgs, use synapse support instead
./ooye.nix
diff --git a/host/Rory-ovh/configuration.nix b/host/Rory-ovh/configuration.nix
index cd3ac32..82be855 100755
--- a/host/Rory-ovh/configuration.nix
+++ b/host/Rory-ovh/configuration.nix
@@ -1,10 +1,9 @@
{
pkgs,
lib,
- nixpkgs-Draupnir,
- nixpkgs-DraupnirPkg,
nixpkgs-master,
matrix-synapse-unwrapped-patched,
+ draupnir,
...
}:
@@ -25,7 +24,6 @@
./services/matrix/draupnir.nix
./services/email/root.nix
#./services/wireguard/wireguard.nix
- ./services/safensound.nix
];
users.groups.ocp = { };
@@ -89,8 +87,7 @@
inherit
pkgs
lib
- nixpkgs-Draupnir
- nixpkgs-DraupnirPkg
+ draupnir
;
};
@@ -98,8 +95,7 @@
inherit
pkgs
lib
- nixpkgs-Draupnir
- nixpkgs-DraupnirPkg
+ draupnir
;
};
@@ -107,8 +103,7 @@
inherit
pkgs
lib
- nixpkgs-Draupnir
- nixpkgs-DraupnirPkg
+ draupnir
;
};
diff --git a/host/Rory-ovh/services/containers/draupnir-ansible/container.nix b/host/Rory-ovh/services/containers/draupnir-ansible/container.nix
index ef35488..e7ca8e2 100644
--- a/host/Rory-ovh/services/containers/draupnir-ansible/container.nix
+++ b/host/Rory-ovh/services/containers/draupnir-ansible/container.nix
@@ -1,6 +1,5 @@
{
- # nixpkgs-Draupnir,
- # nixpkgs-DraupnirPkg,
+ draupnir,
...
}:
@@ -8,8 +7,7 @@
privateNetwork = true;
autoStart = true;
specialArgs = {
- # inherit nixpkgs-Draupnir;
- # inherit nixpkgs-DraupnirPkg;
+ inherit draupnir;
};
config =
{ lib, pkgs, ... }:
@@ -18,13 +16,7 @@
../shared.nix
./root.nix
./services/draupnir.nix
- # "${nixpkgs-Draupnir}/nixos/modules/services/matrix/draupnir.nix"
];
- # nixpkgs.overlays = [
- # (final: prev: {
- # draupnir = nixpkgs-DraupnirPkg.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
- # })
- # ];
};
hostAddress = "192.168.100.1";
localAddress = "192.168.100.19";
diff --git a/host/Rory-ovh/services/containers/draupnir-ansible/services/draupnir.nix b/host/Rory-ovh/services/containers/draupnir-ansible/services/draupnir.nix
index c05b170..ef76500 100644
--- a/host/Rory-ovh/services/containers/draupnir-ansible/services/draupnir.nix
+++ b/host/Rory-ovh/services/containers/draupnir-ansible/services/draupnir.nix
@@ -1,8 +1,9 @@
-{ ... }:
+{ draupnir, ... }:
{
services.draupnir = {
enable = true;
+ package = draupnir;
secrets.accessToken = "/etc/draupnir-access-token";
settings = {
diff --git a/host/Rory-ovh/services/containers/draupnir-cme/container.nix b/host/Rory-ovh/services/containers/draupnir-cme/container.nix
index 4b2d0da..e0b0351 100755
--- a/host/Rory-ovh/services/containers/draupnir-cme/container.nix
+++ b/host/Rory-ovh/services/containers/draupnir-cme/container.nix
@@ -1,6 +1,5 @@
{
- #nixpkgs-Draupnir,
- #nixpkgs-DraupnirPkg,
+ draupnir,
...
}:
@@ -8,8 +7,7 @@
privateNetwork = true;
autoStart = true;
specialArgs = {
- #inherit nixpkgs-Draupnir;
- #inherit nixpkgs-DraupnirPkg;
+ inherit draupnir;
};
config =
{ lib, pkgs, ... }:
@@ -18,13 +16,7 @@
../shared.nix
./root.nix
./services/draupnir.nix
- #"${nixpkgs-Draupnir}/nixos/modules/services/matrix/draupnir.nix"
];
- # nixpkgs.overlays = [
- # (final: prev: {
- # draupnir = nixpkgs-DraupnirPkg.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
- # })
- # ];
};
hostAddress = "192.168.100.1";
localAddress = "192.168.100.17";
diff --git a/host/Rory-ovh/services/containers/draupnir-cme/services/draupnir.nix b/host/Rory-ovh/services/containers/draupnir-cme/services/draupnir.nix
index 4b3cd57..3f3ec92 100755
--- a/host/Rory-ovh/services/containers/draupnir-cme/services/draupnir.nix
+++ b/host/Rory-ovh/services/containers/draupnir-cme/services/draupnir.nix
@@ -1,8 +1,9 @@
-{ ... }:
+{ draupnir, ... }:
{
services.draupnir = {
enable = true;
+ package = draupnir;
secrets.accessToken = "/etc/draupnir-access-token";
settings = {
diff --git a/host/Rory-ovh/services/containers/draupnir-fedora/container.nix b/host/Rory-ovh/services/containers/draupnir-fedora/container.nix
index fe4571e..e19fb68 100644
--- a/host/Rory-ovh/services/containers/draupnir-fedora/container.nix
+++ b/host/Rory-ovh/services/containers/draupnir-fedora/container.nix
@@ -1,6 +1,5 @@
{
- # nixpkgs-Draupnir,
- # nixpkgs-DraupnirPkg,
+ draupnir,
...
}:
@@ -8,8 +7,7 @@
privateNetwork = true;
autoStart = true;
specialArgs = {
- # inherit nixpkgs-Draupnir;
- # inherit nixpkgs-DraupnirPkg;
+ inherit draupnir;
};
config =
{ lib, pkgs, ... }:
@@ -18,13 +16,7 @@
../shared.nix
./root.nix
./services/draupnir.nix
- # "${nixpkgs-Draupnir}/nixos/modules/services/matrix/draupnir.nix"
];
- # nixpkgs.overlays = [
- # (final: prev: {
- # draupnir = nixpkgs-DraupnirPkg.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
- # })
- # ];
};
hostAddress = "192.168.100.1";
localAddress = "192.168.100.18";
diff --git a/host/Rory-ovh/services/containers/draupnir-fedora/services/draupnir.nix b/host/Rory-ovh/services/containers/draupnir-fedora/services/draupnir.nix
index a39b3a9..0b74984 100644
--- a/host/Rory-ovh/services/containers/draupnir-fedora/services/draupnir.nix
+++ b/host/Rory-ovh/services/containers/draupnir-fedora/services/draupnir.nix
@@ -1,8 +1,9 @@
-{ ... }:
+{ draupnir, ... }:
{
services.draupnir = {
enable = true;
+ package = draupnir;
secrets.accessToken = "/etc/draupnir-access-token";
settings = {
diff --git a/host/Rory-ovh/services/containers/syntest1/services/synapse/synapse-main.nix b/host/Rory-ovh/services/containers/syntest1/services/synapse/synapse-main.nix
index 327d648..e4d6075 100755
--- a/host/Rory-ovh/services/containers/syntest1/services/synapse/synapse-main.nix
+++ b/host/Rory-ovh/services/containers/syntest1/services/synapse/synapse-main.nix
@@ -1,7 +1,6 @@
{
config,
pkgs,
- matrix-synapse-patched,
...
}:
diff --git a/host/Rory-ovh/services/matrix/draupnir.nix b/host/Rory-ovh/services/matrix/draupnir.nix
index 3f6d89a..ac4ca6f 100755
--- a/host/Rory-ovh/services/matrix/draupnir.nix
+++ b/host/Rory-ovh/services/matrix/draupnir.nix
@@ -1,9 +1,10 @@
-{ pkgs, draupnirSrc, ... }:
+{ pkgs, draupnir, ... }:
{
services.draupnir = {
enable = true;
+ package = draupnir;
secrets.accessToken = "/data/secrets/draupnir-access-token";
settings = {
diff --git a/host/Rory-ovh/services/safensound.nix b/host/Rory-ovh/services/safensound.nix
deleted file mode 100644
index 69f301a..0000000
--- a/host/Rory-ovh/services/safensound.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- config,
- pkgs,
- lib,
- ...
-}:
-
-{
- services.mongodb = {
- enable = true;
- package = pkgs.mongodb-ce;
- enableAuth = true;
- initialRootPasswordFile = "/etc/mongo-pass";
- #bind_ip = "/run/mongodb.sock";
- extraConfig = ''
- net.unixDomainSocket.filePermissions: 0777
- '';
- };
-
- services.safensound = {
- enable = true;
- dbCredentialsPath = "/data/secrets/safensound-mongodb";
- port = 7645;
- logRequests = "-";
- logQueries = true;
- logAuth = true;
- };
-}
|
