diff --git a/IPAM.md b/IPAM.md index 840d045..451ec88 100644 --- a/IPAM.md +++ b/IPAM.md @@ -5,9 +5,9 @@ | VID | NAME | PREFIX | ACESS | PERMISSIONS | | --- | --------- | ----------------- | ----------------------- | --------------------------------------------- | | 10 | ADMIN | `172.16.10.0/24` | Ethernet with 802.1X | Internet without restrictions, SSH to servers | -| 20 | SERVERS | `172.16.20.0/24` | specific ethernet ports | Internet without restrictions | +| 20 | SERVERS | `172.16.20.0/24` | specific Ethernet ports | Internet without restrictions | | 30 | ADMIN VPN | `172.16.30.0/24` | WireGuard | Internet without restrictions, SSH to servers | -| 100 | GUEST | `172.16.100.0/24` | Ethernet and WiFi | Restricted to HTTP and HTTPS | +| 100 | GUEST | `172.16.100.0/24` | Ethernet and Wi-Fi | Restricted to HTTP and HTTPS | ## IPs @@ -20,16 +20,18 @@ ## Ports & DNS -There is 4 domains that are in use: +There are 4 domains that are in use: - `fantomitechno.dev` and `renoux.dev` that are domains used for public services and are available over the internet - `fantom.home` which is not a real domain (it only exists via my router), this one is used for local services I, as a user, uses - `fantom.internal` another local domain, this one used only for communication between different devices -All DNS entries are registered by OpnSense-DeLoreane to point to each machines (using their 172.16.20.0/24 IP if they are on multiple networks). +All DNS entries are registered by OpnSense-DeLoreane to point to each machine (using their 172.16.20.0/24 IP if they are on multiple networks). All public DNS entries are also registered on Cloudflare with a CNAME entry to `rack.fantomitechno.dev` which points to my public IP. +There is a Port forward for all traffic from the Internet to ports 80, 443 and 17230 of OpnSense-DeLoreane to fant0mib0t. + | Ranges | Description | | :----- | :------------- | | 10XX | Websites | @@ -62,7 +64,6 @@ Global DNS: `conseil.renoux.dev` | 4000, 4001, 4002 | NFS | | | 4010 | Garage S3 API | `s3.fantom.internal` | | 4011 | Garage S3 Web UI | `s3.fantom.home` | -| 4020 | Copyparty | `files.fantomitechno.dev` | ### fant0mib0t @@ -83,6 +84,7 @@ Global DNS: `fant0mib0t.renoux.dev` | 4005 | Gitea (Behind Anubis) | `git.fantomitechno.dev` | | 4010 | Tangled Spindle | `spindle.fantomitechno.dev` | | 4020, 4021 | Cryptpad | `drive.renoux.dev`, `drive.s.renoux.dev` | +| 4025 | Copyparty | `files.fantomitechno.dev` | | 4030 | Kiwix | `kiwix.fantomitechno.dev`, `kiwix.renoux.dev` | | | (redirection to Wikipedia .zim) | `wikipedia.renoux.dev` | | 4040 | Immich | `photo.renoux.dev` | diff --git a/hosts/fant0mib0t/default.nix b/hosts/fant0mib0t/default.nix index 604bb44..9b7f99f 100644 --- a/hosts/fant0mib0t/default.nix +++ b/hosts/fant0mib0t/default.nix @@ -16,6 +16,7 @@ "metrix/prometheus.nix" "radius" "tangled" + "copyparty.nix" "docker.nix" "matrix.nix" ]); diff --git a/modules/caddy/conseil b/modules/caddy/conseil index ce1472e..e092d1a 100644 --- a/modules/caddy/conseil +++ b/modules/caddy/conseil @@ -20,10 +20,6 @@ @admin_vpn_net client_ip 172.16.30.0/24 @guest_net client_ip 172.16.100.0/24 -conseil.renoux.dev { - respond "Welcome!" -} - # Storage http://s3.fantom.internal { import logging garage @@ -36,9 +32,4 @@ s3.fantom.home { abort not @local_net reverse_proxy 127.0.0.1:4011 tls internal -} - -files.fantomitechno.dev { - import logging copyparty - reverse_proxy 127.0.0.1:4020 } \ No newline at end of file diff --git a/modules/caddy/fant0mib0t b/modules/caddy/fant0mib0t index 4cb1d7b..745bb3d 100644 --- a/modules/caddy/fant0mib0t +++ b/modules/caddy/fant0mib0t @@ -20,8 +20,8 @@ @admin_vpn_net client_ip 172.16.30.0/24 @guest_net client_ip 172.16.100.0/24 -fant0mib0t.renoux.dev { - respond "Welcome!" +rack.renoux.dev { + respond "yup, this is a rack!" } # Communication @@ -70,6 +70,11 @@ drive.renoux.dev, drive.s.renoux.dev { } } +files.fantomitechno.dev { + import logging copyparty + reverse_proxy 127.0.0.1:4020 +} + kiwix.fantomitechno.dev, kiwix.renoux.dev { import logging kiwix reverse_proxy 127.0.0.1:4030 diff --git a/modules/nas/copyparty.nix b/modules/copyparty.nix similarity index 89% rename from modules/nas/copyparty.nix rename to modules/copyparty.nix index 42ee135..ea90910 100644 --- a/modules/nas/copyparty.nix +++ b/modules/copyparty.nix @@ -13,7 +13,7 @@ settings = { i = "127.0.0.1"; p = [ - 4020 + 4025 ]; }; @@ -25,7 +25,7 @@ volumes = { "/public" = { - path = "/data/public"; + path = "/nas/public"; access = { r = "*"; @@ -38,7 +38,7 @@ }; }; "/paperless" = { - path = "/data/paperless/import"; + path = "/nas/paperless/import"; access = { rw = [ "fantomitechno" ]; diff --git a/modules/nas/default.nix b/modules/nas/default.nix index bca32da..7694436 100644 --- a/modules/nas/default.nix +++ b/modules/nas/default.nix @@ -1,6 +1,5 @@ { ... }: { imports = [ - ./copyparty.nix ./s3.nix ];