flake.lock

@@ -24,11 +24,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1682915526,
+        "lastModified": 1681866352,
-        "narHash": "sha256-j6JZH9MNQfPZ6Fm+LAGJjHLFT26WUB7scB9hNJiBhbA=",
+        "narHash": "sha256-9XLyzaykO/kf1fc+5CmDxIDHshVmaNHY8FOkqXU0JBU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d46737f11841872e7980b1550511802db85c52b8",
+        "rev": "10e706e52dfda585f96ddc00b1544edf7d9b9f87",
         "type": "github"
       },
       "original": {
@@ -40,11 +40,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1682817260,
+        "lastModified": 1681759395,
-        "narHash": "sha256-kFMXzKNj4d/0Iqbm5l57rHSLyUeyCLMuvlROZIuuhvk=",
+        "narHash": "sha256-7aaRtLxLAy8qFVIA26ulB+Q5nDVzuQ71qi0s0wMjAws=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "db1e4eeb0f9a9028bcb920e00abbc1409dd3ef36",
+        "rev": "cd749f58ba83f7155b7062dd49d08e5e47e44d50",
         "type": "github"
       },
       "original": {

hosts/architect/default.nix

@@ -28,7 +28,7 @@ in
     ./minecraft.nix
     ./prowlarr.nix
     ./libreddit.nix
-    #    ./invidious.nix
+    ./invidious.nix
 #    ./lidarr.nix
     #    ./navidrome.nix
     ./jellyfin.nix
@@ -37,10 +37,9 @@ in
     #./calibre.nix
     ./docker.nix
     ./keycloak.nix
-    #    ./runas.nix
+    ./runas.nix
     ./tailscale.nix
-    #    ./searx.nix
+    ./searx.nix
-    ./plex.nix
   ];
 
   time.timeZone = "Europe/Rome";

hosts/architect/dns.nix

@@ -17,12 +17,6 @@ in
         localise-queries
         min-cache-ttl=120
         max-cache-ttl=2400
-
-        expand-hosts
-        domain=runas.rocks
-        domain=giugl.io
-        domain=devs.runas.rocks
-        domain=devs.giugl.io
       '';
     };
 

hosts/architect/nextcloud.nix

@@ -24,7 +24,7 @@ in
       enable = true;
       hostName = domain;
       https = true;
-      package = pkgs.unstablePkgs.nextcloud26;
+      package = pkgs.unstablePkgs.nextcloud25;
       datadir = "/services/nextcloud";
       caching = {
         redis = true;

hosts/architect/plex.nix

@@ -1,23 +1,16 @@
 { pkgs, lib, ... }:
 
 let
-  domain = "plex.giugl.io";
+  domain = "media.giugl.io";
   network = import ./network.nix;
-  port = 32400;
 in
 {
-  architect.firewall = {
-    openTCP = [ 32400 3005 8324 32469 ];
-    openUDP = [ 1900 5353 32410 32412 32413 32414 ];
-  };
-
   services.plex = {
     enable = true;
     package = pkgs.unstablePkgs.plex;
-    #    dataDir = "/plex";
+    dataDir = "/plex";
   };
 
-
   services.nginx = {
     enable = true;
     # give a name to the virtual host. It also becomes the server name.
@@ -26,6 +19,10 @@ in
       enableACME = true;
       http2 = true;
       extraConfig = ''
+          allow 10.3.0.0/24;
+          allow 10.0.0.0/24;
+          deny all;
+
         #Some players don't reopen a socket and playback stops totally instead of resuming after an extended pause
           send_timeout 100m;
 
@@ -80,10 +77,8 @@ in
         # Buffering off send to the client as soon as the data is received from Plex.
           proxy_redirect off;
           proxy_buffering off;
-
-          add_header 'Content-Security-Policy' 'upgrade-insecure-requests';
       '';
-      locations."/" = { proxyPass = "http://127.0.0.1:${toString port}"; };
+      locations."/" = { proxyPass = "http://127.0.0.1:32400"; };
     };
   };