summary refs log tree commit diff
path: root/host/Rory-nginx
diff options
context:
space:
mode:
authorRory& <root@rory.gay>2025-02-08 19:36:41 +0100
committerRory& <root@rory.gay>2025-02-08 19:44:20 +0100
commitc41f787ecf94fce14b684a42e521ad620ea80844 (patch)
treef9818c505889351cae5140ce145b382b3aadc6e2 /host/Rory-nginx
parentAdd laptop (diff)
downloadRory-Open-Architecture-c41f787ecf94fce14b684a42e521ad620ea80844.tar.xz
Format files
Diffstat (limited to 'host/Rory-nginx')
-rwxr-xr-xhost/Rory-nginx/configuration.nix12
-rwxr-xr-xhost/Rory-nginx/services/containers/draupnir-cme/container.nix6
-rw-r--r--host/Rory-nginx/services/containers/draupnir-fedora/container.nix6
-rwxr-xr-xhost/Rory-nginx/services/containers/draupnir-linux-mint/container.nix6
-rwxr-xr-xhost/Rory-nginx/services/nginx/rory.gay/jitsi.nix12
5 files changed, 33 insertions, 9 deletions
diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix

index 961f7da..f6375a9 100755 --- a/host/Rory-nginx/configuration.nix +++ b/host/Rory-nginx/configuration.nix
@@ -83,7 +83,9 @@ # conduit = grapevine; #}; - containers."matrixunittests" = import ./services/containers/matrixunittests/container.nix { inherit pkgs lib grapevine; }; + containers."matrixunittests" = import ./services/containers/matrixunittests/container.nix { + inherit pkgs lib grapevine; + }; # #containers."matrixunittests-conduit" = import ./services/containers/matrixunittests-conduit/container.nix { # inherit pkgs lib; @@ -95,8 +97,12 @@ initialEmail = "root@localhost.localdomain"; initialPasswordFile = "/etc/matrix-user-pass"; }; - 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; + }; #containers."draupnir-linux-mint" = import ./services/containers/draupnir-linux-mint/container.nix { inherit pkgs lib nixpkgs-Draupnir; }; diff --git a/host/Rory-nginx/services/containers/draupnir-cme/container.nix b/host/Rory-nginx/services/containers/draupnir-cme/container.nix
index b8936ac..7b87264 100755 --- a/host/Rory-nginx/services/containers/draupnir-cme/container.nix +++ b/host/Rory-nginx/services/containers/draupnir-cme/container.nix
@@ -15,7 +15,11 @@ ./services/draupnir.nix "${nixpkgs-Draupnir}/nixos/modules/services/matrix/draupnir.nix" ]; - nixpkgs.overlays = [ (final: prev: { draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir; }) ]; + nixpkgs.overlays = [ + (final: prev: { + draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir; + }) + ]; }; hostAddress = "192.168.100.1"; localAddress = "192.168.100.17"; diff --git a/host/Rory-nginx/services/containers/draupnir-fedora/container.nix b/host/Rory-nginx/services/containers/draupnir-fedora/container.nix
index 4ab9009..82683d7 100644 --- a/host/Rory-nginx/services/containers/draupnir-fedora/container.nix +++ b/host/Rory-nginx/services/containers/draupnir-fedora/container.nix
@@ -15,7 +15,11 @@ ./services/draupnir.nix "${nixpkgs-Draupnir}/nixos/modules/services/matrix/draupnir.nix" ]; - nixpkgs.overlays = [ (final: prev: { draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir; }) ]; + nixpkgs.overlays = [ + (final: prev: { + draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir; + }) + ]; }; hostAddress = "192.168.100.1"; localAddress = "192.168.100.18"; diff --git a/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix b/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix
index 17c981a..41d25c5 100755 --- a/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix +++ b/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix
@@ -15,7 +15,11 @@ ./services/draupnir.nix "${nixpkgs-Draupnir}/nixos/modules/services/matrix/draupnir.nix" ]; - nixpkgs.overlays = [ (final: prev: { draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir; }) ]; + nixpkgs.overlays = [ + (final: prev: { + draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir; + }) + ]; }; hostAddress = "192.168.100.1"; localAddress = "192.168.100.19"; diff --git a/host/Rory-nginx/services/nginx/rory.gay/jitsi.nix b/host/Rory-nginx/services/nginx/rory.gay/jitsi.nix
index f6091bc..9469087 100755 --- a/host/Rory-nginx/services/nginx/rory.gay/jitsi.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/jitsi.nix
@@ -39,7 +39,13 @@ in proxy_set_header Host $host; ''; }; - locations."=/external_api.js" = lib.mkDefault { alias = "${pkgs.jitsi-meet}/libs/external_api.min.js"; }; - locations."=/config.js" = lib.mkDefault { alias = overrideJs "${pkgs.jitsi-meet}/config.js" "config" (lib.recursiveUpdate defaultCfg cfg.config) cfg.extraConfig; }; - locations."=/interface_config.js" = lib.mkDefault { alias = overrideJs "${pkgs.jitsi-meet}/interface_config.js" "interfaceConfig" cfg.interfaceConfig ""; }; + locations."=/external_api.js" = lib.mkDefault { + alias = "${pkgs.jitsi-meet}/libs/external_api.min.js"; + }; + locations."=/config.js" = lib.mkDefault { + alias = overrideJs "${pkgs.jitsi-meet}/config.js" "config" (lib.recursiveUpdate defaultCfg cfg.config) cfg.extraConfig; + }; + locations."=/interface_config.js" = lib.mkDefault { + alias = overrideJs "${pkgs.jitsi-meet}/interface_config.js" "interfaceConfig" cfg.interfaceConfig ""; + }; }