From 9da54439586ae932a63085c00388fc84f97de5ec Mon Sep 17 00:00:00 2001 From: tristan <> Date: Sun, 25 May 2025 15:39:04 -0400 Subject: [PATCH] murmur + hedgedoc --- configuration.nix | 1 + imports/caddy.nix | 4 ++++ imports/hedgedoc.nix | 16 +++++++++++++++- imports/murmur.nix | 11 +++++++++++ imports/postgres.nix | 12 +++++++++--- imports/vaultwarden.nix | 2 +- 6 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 imports/murmur.nix diff --git a/configuration.nix b/configuration.nix index ded579c..e7e0406 100644 --- a/configuration.nix +++ b/configuration.nix @@ -11,6 +11,7 @@ ./imports/caddy.nix ./imports/hedgedoc.nix ./imports/postgres.nix + ./imports/murmur.nix ./imports/navidrome.nix ./imports/vaultwarden.nix ./imports/wireguard.nix diff --git a/imports/caddy.nix b/imports/caddy.nix index 975055e..32640d4 100644 --- a/imports/caddy.nix +++ b/imports/caddy.nix @@ -16,5 +16,9 @@ reverse_proxy localhost:8000 ''; + virtualHosts."http://mumble.mymarseille.duckdns.org".extraConfig = '' + reverse_proxy localhost:64738 + ''; + }; } diff --git a/imports/hedgedoc.nix b/imports/hedgedoc.nix index 63d8feb..595e708 100644 --- a/imports/hedgedoc.nix +++ b/imports/hedgedoc.nix @@ -3,9 +3,23 @@ services.hedgedoc = { enable = true; settings = { - domain = "hedgedoc.mymarseille.duckdns.org"; + domain = "notes.mymarseille.duckdns.org"; port = 8001; + + dbURL = "postgresql://localhost:5432/hedgedoc"; + + allowAnonymous = false; + allowAnonymousEdits = true; + + sessionSecret = "IRpdLVn5z45C7IVhcYkqCd4yrtd21BlasMMEvvLkiF6xBaL1BTUQzqeDg5rA2q9X"; + }; }; + systemd.services.hedgedoc = { + requires = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + }; + + } diff --git a/imports/murmur.nix b/imports/murmur.nix new file mode 100644 index 0000000..b37a2db --- /dev/null +++ b/imports/murmur.nix @@ -0,0 +1,11 @@ +{ config, lib, pkgs, ... }: + +{ + services.murmur= { + enable = true; + password = "Mine"; + port = 64738; + welcometext = "WELCOME TO MINECRATF"; + }; + +} diff --git a/imports/postgres.nix b/imports/postgres.nix index cf0cf27..baef54d 100644 --- a/imports/postgres.nix +++ b/imports/postgres.nix @@ -3,10 +3,12 @@ services.postgresql = { enable = true; - ensureDatabases = [ "vaultwarden" ]; + ensureDatabases = [ "vaultwarden" "hedgedoc" ]; authentication = pkgs.lib.mkOverride 10 '' - #type database DBuser auth-method - local all all trust + #type database DBuser IP Range auth-method + local all all trust + host all all ::1/128 trust + host all all 127.0.0.1/32 trust ''; # When removing users or removing permissions from users here, must also remove them manually @@ -15,6 +17,10 @@ name = "vaultwarden"; ensureDBOwnership = true; } + { + name = "hedgedoc"; + ensureDBOwnership = true; + } ]; diff --git a/imports/vaultwarden.nix b/imports/vaultwarden.nix index e760075..ce7f239 100644 --- a/imports/vaultwarden.nix +++ b/imports/vaultwarden.nix @@ -12,7 +12,7 @@ ADMIN_TOKEN = "$argon2id$v=19$m=65540,t=3,p=4$djJtbTZsUlhBY0lxWldqSFV2NEUwNloxRlF0Uk5VVmFOalFmT0hQaHBoMD0$Ekj+ymeGJXyx84GCE3wN123f/Khdcw1GGPMv+s1tqmU"; - DATABASE_URL="postgresql://:5432/vaultwarden"; + DATABASE_URL="postgresql://localhost:5432/vaultwarden"; SMTP_FROM = "vincentwaltz8@gmail.com"; SMTP_FROM_NAME = "VaultWarden";