moving server from old config to new one (finally)

This commit is contained in:
martyTF 2026-05-14 00:09:24 +02:00
parent 5306a9a633
commit 634171e91d
3 changed files with 68 additions and 9 deletions

View file

@ -6,5 +6,66 @@
}:
{
config = { };
config = {
server = {
arr = {
enable = true;
};
cloud = {
immich = {
enable = true;
public = true;
};
nextcloud = {
enable = true;
public = true;
};
};
media = {
jellyfin = {
enable = true;
public = false;
};
jellyseer = {
enable = true;
public = false;
};
kavita = {
enable = true;
public = false;
};
navidrome = {
enable = true;
public = false;
};
};
misc = {
dawarich = {
enable = true;
public = false;
};
forgejo = {
enable = true;
public = true;
};
lauti = {
enable = true;
public = true;
};
vaultwarden = {
enable = true;
public = true;
};
};
social = {
gotosocial = {
enable = true;
public = true;
};
synapse = {
enable = true;
};
};
};
};
}

View file

@ -6,9 +6,9 @@
}:
{
options.server = {
options.server.media = {
jellyfin = {
enable = lib.mkEnableOption "enable jelyfin";
enable = lib.mkEnableOption "enable jellyfin";
port = lib.mkOption {
default = 8096;
description = "set jellyfin port";

View file

@ -4,9 +4,7 @@
pkgs,
...
}:
let
domain = "${config.server.misc.lauti.subdomain}.${config.networking.domain}";
in
{
options = {
server.misc.lauti = {
@ -17,7 +15,7 @@ in
};
public = lib.mkEnableOption "make lauti public";
domain = lib.mkOption {
default = "";
default = "calendar";
description = "lauti domain";
};
subdomain = lib.mkOption {
@ -32,7 +30,7 @@ in
enable = config.server.misc.lauti.enable;
settings = {
LAUTI_ADMIN_EMAIL = "lauti@${config.networking.domain}";
LAUTI_BASE_URL = "https://${domain}";
LAUTI_BASE_URL = "https://${config.server.misc.lauti.subdomain}.${config.networking.domain}";
LAUTI_OSM_TILE_CACHE_DIR = "/var/lib/lauti/osm";
LAUTI_OSM_TILE_SERVER = "https://tile.openstreetmap.org/{z}/{x}/{y}.png";
LAUTI_TIMEZONE = "Europe/Berlin";
@ -42,7 +40,7 @@ in
};
nginx = {
virtualHosts = {
"${domain}" =
"${config.server.misc.lauti.subdomain}.${config.networking.domain}" =
if config.server.misc.lauti.public then
{
enableACME = true;