From 7580bc1e81d575f227cdac2cd58c29aa7bd17549 Mon Sep 17 00:00:00 2001 From: jz8132543 Date: Sun, 22 Sep 2024 00:23:09 +0800 Subject: [PATCH] add: matrix --- nixos/hosts/fra1/default.nix | 1 + .../isk/_steam/dst/Caves/worldgenoverride.lua | 8 ++--- .../_steam/dst/Master/worldgenoverride.lua | 4 +-- nixos/hosts/isk/_steam/dst/modoverrides.lua | 36 +++++++++---------- nixos/modules/services/matrix.nix | 4 +-- terraform/cloudflare.tf | 2 ++ 6 files changed, 29 insertions(+), 26 deletions(-) diff --git a/nixos/hosts/fra1/default.nix b/nixos/hosts/fra1/default.nix index 297b9ded..578fbf5b 100644 --- a/nixos/hosts/fra1/default.nix +++ b/nixos/hosts/fra1/default.nix @@ -13,6 +13,7 @@ nixosModules.services.doraim nixosModules.services.ntfy nixosModules.services.sogo + nixosModules.services.matrix (import nixosModules.services.keycloak { }) (import nixosModules.services.vaultwarden { }) (import nixosModules.services.alist { }) diff --git a/nixos/hosts/isk/_steam/dst/Caves/worldgenoverride.lua b/nixos/hosts/isk/_steam/dst/Caves/worldgenoverride.lua index 0020699d..66a3376d 100644 --- a/nixos/hosts/isk/_steam/dst/Caves/worldgenoverride.lua +++ b/nixos/hosts/isk/_steam/dst/Caves/worldgenoverride.lua @@ -1,6 +1,6 @@ return { - override_enabled = true, - worldgen_preset = "DST_CAVE", - settings_preset = "DST_CAVE", - overrides = {}, + override_enabled = true, + worldgen_preset = "DST_CAVE", + settings_preset = "DST_CAVE", + overrides = {}, } diff --git a/nixos/hosts/isk/_steam/dst/Master/worldgenoverride.lua b/nixos/hosts/isk/_steam/dst/Master/worldgenoverride.lua index e4ef3b00..7ece50bd 100644 --- a/nixos/hosts/isk/_steam/dst/Master/worldgenoverride.lua +++ b/nixos/hosts/isk/_steam/dst/Master/worldgenoverride.lua @@ -1,4 +1,4 @@ return { - override_enabled = true, - overrides = {}, + override_enabled = true, + overrides = {}, } diff --git a/nixos/hosts/isk/_steam/dst/modoverrides.lua b/nixos/hosts/isk/_steam/dst/modoverrides.lua index 718e1185..33b22a5b 100644 --- a/nixos/hosts/isk/_steam/dst/modoverrides.lua +++ b/nixos/hosts/isk/_steam/dst/modoverrides.lua @@ -1,20 +1,20 @@ return { - --# Health Info - ["workshop-375859599"] = { enabled = true }, - --# Show Me - ["workshop-2287303119"] = { enabled = true }, - --# No Thermal Stone Durability - ["workshop-466732225"] = { enabled = true }, - --# Extra Equip Slots - ["workshop-375850593"] = { enabled = true }, - --# Display Attack Range - ["workshop-2078243581"] = { enabled = true }, - --# Increased Stack size - ["workshop-374550642"] = { enabled = true }, - --# Combined Status - ["workshop-376333686"] = { enabled = true }, - --# Global Positions - ["workshop-378160973"] = { enabled = true }, - --# Demon sword Muramasa - ["workshop-1842087172"] = { enabled = true }, + --# Health Info + ["workshop-375859599"] = { enabled = true }, + --# Show Me + ["workshop-2287303119"] = { enabled = true }, + --# No Thermal Stone Durability + ["workshop-466732225"] = { enabled = true }, + --# Extra Equip Slots + ["workshop-375850593"] = { enabled = true }, + --# Display Attack Range + ["workshop-2078243581"] = { enabled = true }, + --# Increased Stack size + ["workshop-374550642"] = { enabled = true }, + --# Combined Status + ["workshop-376333686"] = { enabled = true }, + --# Global Positions + ["workshop-378160973"] = { enabled = true }, + --# Demon sword Muramasa + ["workshop-1842087172"] = { enabled = true }, } diff --git a/nixos/modules/services/matrix.nix b/nixos/modules/services/matrix.nix index f137f1a4..149c1727 100644 --- a/nixos/modules/services/matrix.nix +++ b/nixos/modules/services/matrix.nix @@ -230,7 +230,7 @@ lib.mkMerge [ service = "element"; }; matrix-admin = { - rule = "Host(`m-admin.dora.im`)"; + rule = "Host(`admin.m.dora.im`)"; entryPoints = [ "https" ]; service = "matrix-admin"; }; @@ -261,7 +261,7 @@ lib.mkMerge [ root = element-web-config; }; }; - virtualHosts."m-admin.*" = { + virtualHosts."admin.m.*" = { locations."/" = { root = pkgs.synapse-admin; }; diff --git a/terraform/cloudflare.tf b/terraform/cloudflare.tf index 1f3a71d0..59802658 100644 --- a/terraform/cloudflare.tf +++ b/terraform/cloudflare.tf @@ -81,6 +81,8 @@ locals { atuin = { on = "fra1", proxy = false } ntfy = { on = "fra1", proxy = false } mail = { on = "fra1", proxy = false } + m = { on = "fra1", proxy = false } + admin.m = { on = "fra1", proxy = false } searx = { on = "hkg4", proxy = false } morty = { on = "hkg4", proxy = false } }