aboutsummaryrefslogtreecommitdiff
path: root/hosts/ganymede
diff options
context:
space:
mode:
Diffstat (limited to 'hosts/ganymede')
-rw-r--r--hosts/ganymede/caddy-env.age11
-rw-r--r--hosts/ganymede/caddy.nix6
-rw-r--r--hosts/ganymede/config.nix18
-rw-r--r--hosts/ganymede/minecraft.nix10
-rw-r--r--hosts/ganymede/nixos.nix28
-rw-r--r--hosts/ganymede/tsnsrv-authkey.age7
6 files changed, 56 insertions, 24 deletions
diff --git a/hosts/ganymede/caddy-env.age b/hosts/ganymede/caddy-env.age
index 79d7b91..ecfc05a 100644
--- a/hosts/ganymede/caddy-env.age
+++ b/hosts/ganymede/caddy-env.age
@@ -1,6 +1,7 @@
age-encryption.org/v1
--> ssh-ed25519 Jg4yWQ cVxgS8Sy6bB9lQVeDBQVhmCaD437YxPAZduSzFA6WHE
-KV9ZrAEH3z8cT0IeaIfkqMYhU/4LS2St0ySK030Ie1c
---- pUeKTMwZf3FARqVLl9TARgItjcr1O82hUKaZ9YtjFRM
-a_v1BRgʫ*+r֘0}ܨd`˟ϞJ<3hi1|Gjl3!7r 3Xp=d`71ݻѲh<Hdy;V˜NiGN^@`OnTyq>FW5/2̞?[HZ - Sd:FCGq%-#W~Wz_XF)ZS~MhCF!C)N*ٟ
-R \ No newline at end of file
+-> ssh-ed25519 Jg4yWQ t4jtOOcuC4v735Yi4FzdDnvjQFNYVgzMluuH7H3oxx4
+qLKbZ3wA3kk7UXqwUJN2HH+6Wr3qgzINNwLx+dbgsIg
+--- im4dvpbhdvB7fwa8QJ7clFZ+5aVIaXld/gPlhUalc14
+>u4BECQD:3kkKļc}}}mK)HM3v}ܣI9Ikxr1s?"8Д>J{uafϚ}.3Oa9m2- @C0b X|]:9`WX1ba|W2=l]Cw U&~"0 !
+6
+MFίp D˅+q `-R6/L 4 \ No newline at end of file
diff --git a/hosts/ganymede/caddy.nix b/hosts/ganymede/caddy.nix
index e6f18ab..6ad32cf 100644
--- a/hosts/ganymede/caddy.nix
+++ b/hosts/ganymede/caddy.nix
@@ -19,12 +19,6 @@
}
'';
- virtualHosts."https://web.tail7cca06.ts.net".extraConfig = ''
- bind tailscale/web
- root * /var/www
- file_server
- '';
-
virtualHosts."https://williamsfam.us.com".extraConfig = ''
root * /var/www
file_server
diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix
index c2b312f..3adf620 100644
--- a/hosts/ganymede/config.nix
+++ b/hosts/ganymede/config.nix
@@ -1,5 +1,5 @@
{config, ...}: let
- tailscaleIP = "100.69.180.89";
+ tailscaleIP = "100.100.218.182";
in {
collinux = {
user.name = "collin";
@@ -7,6 +7,7 @@ in {
secrets = {
"williams-psk".file = ./williams-psk.age;
"caddy-env".file = ./caddy-env.age;
+ "tsnsrv-authkey".file = ./tsnsrv-authkey.age;
};
terminal = {
@@ -33,7 +34,10 @@ in {
gateway = "192.168.50.1";
};
};
- tailscale.enable = true;
+ tailscale = {
+ enable = true;
+ tailnet = "collinux.tailnet";
+ };
sshd = {
enable = true;
bind_host = tailscaleIP;
@@ -41,10 +45,12 @@ in {
};
selfhost = {
- adguard = {
- enable = true;
- bind_host = tailscaleIP;
- };
+ magic_caddy.enable = false;
+
+ # adguard = {
+ # enable = true;
+ # bind_host = tailscaleIP;
+ # };
forgejo = {
enable = true;
bind_host = tailscaleIP;
diff --git a/hosts/ganymede/minecraft.nix b/hosts/ganymede/minecraft.nix
index cff5de2..c244868 100644
--- a/hosts/ganymede/minecraft.nix
+++ b/hosts/ganymede/minecraft.nix
@@ -1,6 +1,6 @@
{config, ...}: {
networking.firewall.allowedUDPPorts = [19132];
- virtualisation.oci-containers.backend = "podman";
+ virtualisation.oci-containers.backend = "docker";
virtualisation.oci-containers.containers."Minecraft" = {
environment = {
@@ -9,16 +9,14 @@
SERVER_NAME = "YServer";
TZ = config.time.timeZone;
- VERSION = "1.21.81.2";
- CONTENT_LOG_FILE_ENABLED = "true";
+ VERSION = "1.21.131.1";
+ CONTENT_LOG_FILE_ENABLED = "false";
ALLOW_CHEATS = "false";
DIFFICULTY = "1";
};
image = "itzg/minecraft-bedrock-server";
ports = ["0.0.0.0:19132:19132/udp"];
- volumes = ["/srv/minecraft/:/data"];
-
- podman.sdnotify = "conmon"; # avoid nasty errors about healthcheck (idk, the service runs fine)
+ volumes = ["/var/lib/minecraft/:/data"];
};
}
diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix
index 863032f..ce30973 100644
--- a/hosts/ganymede/nixos.nix
+++ b/hosts/ganymede/nixos.nix
@@ -1,8 +1,16 @@
-{inputs, ...}: {
+{
+ config,
+ lib,
+ inputs,
+ ...
+}: {
imports = [
inputs.disko.nixosModules.disko
+ inputs.tsnsrv.nixosModules.default
./disks.nix
+ ./minecraft.nix
+
./iwlwifi.nix
./caddy.nix
];
@@ -15,6 +23,24 @@
networkConfig.DHCP = "yes";
};
+ services.openssh.settings.PasswordAuthentication = lib.mkForce true;
+
+ # services.tsnsrv = {
+ # enable = true;
+ # defaults = {
+ # authKeyPath = config.collinux.secrets."tsnsrv-authkey".path;
+ # ephemeral = true;
+ # loginServerUrl = "https://williamsfam.us.com";
+ # };
+
+ # services = {
+ # "adguard" = {
+ # listenAddr = ":80";
+ # toURL = "http://localhost:8001";
+ # };
+ # };
+ # };
+
nixpkgs.hostPlatform = "x86_64-linux";
system.stateVersion = "25.05";
}
diff --git a/hosts/ganymede/tsnsrv-authkey.age b/hosts/ganymede/tsnsrv-authkey.age
new file mode 100644
index 0000000..d0e6eb1
--- /dev/null
+++ b/hosts/ganymede/tsnsrv-authkey.age
@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 Jg4yWQ NYO6CUksU6appmdib7CER3YYbcKoyn0wmB4YGTCeTE0
+tizx14UdvQftYrkDa3iXQYDp6JPWHfjDmFwjr11FBxQ
+-> ssh-ed25519 azBilg 3PYXHVdB2y2Y42ijOiv8LJ9c4WmeB5ivEPcehfS3Wns
+tP/xCHzd31DydF5aCn1tJGudanXLl+DIPod7KFtglXQ
+--- nbch7DRt1CYKBqzE9CeUIJgTMKIUCEA/CXVQZjkywfI
+~}H <42)U{QK3%G^FW3GJy 1 \ No newline at end of file