titaniumtown/server-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Simon Gardling
2024-11-18 15:43:44 -05:00
parent 1e6fa71a53
commit bb942d377c
4 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
flake.lock generated
View File

@@ -43,11 +43,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731808593, "lastModified": 1731894859,
"narHash": "sha256-dyMU//DLz1Zs1bl7jAZA6d68bXCRzTYim4JyrLFfqME=", "narHash": "sha256-G8W50PtK+VkwnC/bYUWXy0Bg4+AX21Sg/wg8pjjE+yw=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "ada86c417801a44c32b59374b1e0b3141826291a", "rev": "400994c4d85841549bcbdac9dd71fc5ce505cdf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -74,16 +74,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731816655, "lastModified": 1731676054,
"narHash": "sha256-55e1JMAuYvHZs9EICprWgJ4RmaWwDuSjzJ5K7S7zb6w=", "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0a14706530dcb90acecb81ce0da219d88baaae75", "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "master", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

13
flake.nix
View File

@@ -2,8 +2,8 @@
description = "Flake for server muffin"; description = "Flake for server muffin";
inputs = { inputs = {
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/master"; # nixpkgs.url = "github:NixOS/nixpkgs/master";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
@@ -46,6 +46,7 @@
certs = services_dir + "/http_certs"; certs = services_dir + "/http_certs";
data_dir = services_dir + "/http"; data_dir = services_dir + "/http";
domain = "gardling.com"; domain = "gardling.com";
wg_ip = "192.168.15.1";
}; };
gitea = { gitea = {
@@ -66,10 +67,6 @@
server_name = "main"; server_name = "main";
}; };
gluetun = {
dir = services_dir + "/gluetun";
};
torrent = { torrent = {
SavePath = hdd_path + "/torrents"; SavePath = hdd_path + "/torrents";
TempPath = hdd_path + "/torrents/incomplete"; TempPath = hdd_path + "/torrents/incomplete";
@@ -78,10 +75,6 @@
jellyfin = { jellyfin = {
dir = services_dir + "/jellyfin"; dir = services_dir + "/jellyfin";
}; };
ollama = {
data_dir = services_dir + "/ollama";
};
}; };
in in
{ {

7
services/caddy.nix
View File

@@ -8,9 +8,6 @@
services.caddy = { services.caddy = {
enable = true; enable = true;
email = "titaniumtown@proton.me"; email = "titaniumtown@proton.me";
globalConfig = ''
auto_https disable_redirects
'';
virtualHosts = { virtualHosts = {
${service_configs.https.domain} = { ${service_configs.https.domain} = {
extraConfig = '' extraConfig = ''
@@ -39,13 +36,13 @@
"bitmagnet.${service_configs.https.domain}".extraConfig = '' "bitmagnet.${service_configs.https.domain}".extraConfig = ''
tls internal tls internal
${import ../secrets/caddy_auth.nix} ${import ../secrets/caddy_auth.nix}
reverse_proxy http://192.168.15.1:${builtins.toString service_configs.ports.bitmagnet} reverse_proxy ${service_configs.https.wg_ip}:${builtins.toString service_configs.ports.bitmagnet}
''; '';
"torrent.${service_configs.https.domain}".extraConfig = '' "torrent.${service_configs.https.domain}".extraConfig = ''
tls internal tls internal
${import ../secrets/caddy_auth.nix} ${import ../secrets/caddy_auth.nix}
reverse_proxy http://192.168.15.1:${builtins.toString service_configs.ports.torrent} reverse_proxy ${service_configs.https.wg_ip}:${builtins.toString service_configs.ports.torrent}
''; '';
}; };
}; };

4
services/qbittorrent.nix
View File

@@ -30,8 +30,8 @@
serverConfig.Preferences.WebUI = { serverConfig.Preferences.WebUI = {
AlternativeUIEnabled = true; AlternativeUIEnabled = true;
RootFolder = "${pkgs.fetchzip { RootFolder = "${pkgs.fetchzip {
url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.17.0/vuetorrent.zip"; url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.18.0/vuetorrent.zip";
hash = "sha256-PpumQCgIZp9wENL1XZvf7CdUAW9W0pQP5wqtG9oOUpM="; sha256 = "Z+N1RgcF67R6hWEfmfBls1+YLWkhEJQuOVqXXJCyptE=";
}}"; }}";
# disable auth because we use caddy for auth # disable auth because we use caddy for auth