Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles

system-modules/nx2site/copyparty.nix

@@ -8,16 +8,21 @@
       package = pkgs.copyparty;
       openFilesLimit = 8192;
       settings = {
-        i = [ "0.0.0.0" "unix:770:copyparty:/dev/shm/party.sock" ];
+
         p = [ 3210 3211 ];
-        no-reload = true;
+        i = [ "0.0.0.0" "unix:770:copyparty:/dev/shm/party.sock" ];
+        name = "NxCopyParty";
+
         ignored-flag = false;
-        shr = "/shares";
-        css-browser = "https://nx2.site/copyparty/extra-browser.css";
-        theme = 6;
-        xff-hdr = "X-Forwarded-For"; # so that cpp knows the real client ip behind nginx. Must match with nginx config
-        rproxy = 1;
+        no-reload = true;
         no-robots = true;
+
+        rproxy = 1;
+        xff-hdr = "X-Forwarded-For"; # so that cpp knows the real client ip behind nginx. Must match with nginx config
+
+        shr = "/shares";
+        css-browser = "https://${hyper.domain}/copyparty/extra-browser.css";
+        theme = 6;
       };
       accounts = {
         "${hyper.user}" = {

system-modules/nx2site/proxy.nix

@@ -90,24 +90,22 @@
         default = true;
         listen = dl;
         locations = {
-          "/" = {
-            extraConfig = ''
+          "/".extraConfig = ''
             index index.html;
           '';
-          };
-          "~^(/ba)$"                   = { return = "301 /BA.pdf"; };
-          "/.well-known/matrix/client" = { return = "502"; };
-          "/.well-known/matrix/server" = { return = "502"; };
-          "/phone" = { return = "301 /cards/phone"; };
-          "/about-me" = { return = "301 /slides/about-me"; };
-          "/about-this-site" = { return = "301 /slides/about-this-site"; };
-          "/gpg" = { return = "301 /cards/gpg"; };
-          "/contact" = { return = "301 /cards/contact"; };
+          "~ ^(/.well-known/matrix/client)$".return = "502";
+          "~ ^(/.well-known/matrix/server)$".return = "502";
+          "~ ^(/phone)$".return                     = "301 /cards/phone";
+          "~ ^(/about-me)$".return                  = "301 /slides/about-me";
+          "~ ^(/about-this-site)$".return           = "301 /slides/about-this-site";
+          "~ ^(/gpg)$".return                       = "301 /cards/gpg";
+          "~ ^(/contact)$".return                   = "301 /cards/contact";
+          "~ ^(/ba)$".return                        = "301 /BA.pdf";
         }; 
       }; 
       "matrix.${hyper.domain}" = {
         listen = dl;
-        locations = { "~.*" = { return = "502"; }; }; 
+        locations."~.*".return = "502";
       };
       # "pw.${hyper.domain}" = vh // {
       #   listen = dl;