diff options
Diffstat (limited to 'hosts/ganymede')
| -rw-r--r-- | hosts/ganymede/config.nix | 33 | ||||
| -rw-r--r-- | hosts/ganymede/nixos.nix | 37 |
2 files changed, 7 insertions, 63 deletions
diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix index 6fe1e3e..c4d9109 100644 --- a/hosts/ganymede/config.nix +++ b/hosts/ganymede/config.nix @@ -8,11 +8,6 @@ owner = "wpa_supplicant"; }; - "gliese-key" = { - file = ../gliese-key.age; - owner = "collin"; - }; - "caddy-env".file = ./secrets/caddy-env.age; "collin-copyparty-password" = { @@ -55,18 +50,9 @@ services = { sshd = { enable = true; - portConfig = [ - { - port = 2222; - listenAddr = "0.0.0.0"; - rootLogin = true; - } - { - port = 22; - listenAddr = "0.0.0.0"; - rootLogin = true; - } - ]; + port = 22; + listenAddr = "0.0.0.0"; + rootLogin = true; }; goaccess = { @@ -83,21 +69,16 @@ privateUrl = "git.ganymede"; }; - agate = { - enable = true; - publicUrl = "williamsfam.us.com"; - }; + # agate = { + # enable = true; + # publicUrl = "williamsfam.us.com"; + # }; minecraft = { enable = true; listenAddr = "0.0.0.0"; }; - polaris = { - enable = true; - privateUrl = "music.ganymede"; - }; - qbittorrent = { enable = true; privateUrl = "bittorrent.ganymede"; diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix index a2314ee..a706b5f 100644 --- a/hosts/ganymede/nixos.nix +++ b/hosts/ganymede/nixos.nix @@ -16,8 +16,6 @@ facter.reportPath = ./facter.json; - virtualisation.oci-containers.backend = "docker"; # fix weird issue with minecraft server (only thing running in docker right now) - # backup usb teather configuration systemd.network.networks."80-usb-teather" = { name = "enp0s20f0u2"; @@ -31,43 +29,8 @@ wantedBy = ["default.target"]; }; - # VPN to server - systemd.network = { - netdevs."10-wg0" = { - netdevConfig = { - Kind = "wireguard"; - Name = "wg0"; - }; - wireguardConfig = { - PrivateKeyFile = config.collinux.secrets."wireguard-pk".path; - ListenPort = 51820; - }; - wireguardPeers = [ - { - PublicKey = "seOq75FUGb+KThvOXCEAGdabWbb+jTRUntITpuAPgWA="; - AllowedIPs = "0.0.0.0/0"; - Endpoint = "20.251.8.247:51820"; - PersistentKeepalive = 25; - } - ]; - }; - networks."wg0" = { - matchConfig.Name = "wg0"; - address = ["10.100.0.2/24"]; - DHCP = "no"; - networkConfig.IPv6AcceptRA = false; - }; - }; - services.fail2ban.enable = true; - programs.ssh.extraConfig = '' - Host gliese - HostName 10.100.0.1 - User green - IdentityFile ${config.collinux.secrets."gliese-key".path} - ''; - # merge logs from subdomains services.caddy.virtualHosts."up.williamsfam.us.com".logFormat = lib.mkForce '' output file /var/log/caddy/access-williamsfam.us.com.log |