fix ssh clone url

[flake_server] / configuration.nix

diff --git a/configuration.nix b/configuration.nix
index d5931f8b107eda1c5804e48db037ea43daee0cf0..9bfd10cb1f7c97a86ada6c08054e7f0fffd8e79c 100644 (file)
--- a/configuration.nix
+++ b/configuration.nix
@@ -109,11 +109,8 @@
     createHome = true;
     homeMode = "750";
     shell = "${pkgs.git}/bin/git-shell";
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICQOPefMnq0qvFjYxlrdlSmUgyCbvV85gkfRykVlTnrn ps@nixos"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB0mNZn4EWdIwXEGfqUwwJy5STaZLYWbeKqDd4MN8WIK root@nixos"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+1sLAf+I+o3aODJeDuNvbqKD1wokQyk6oX0ZGK8su5 root@pschdev"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN6sNqiMZpmRkiwjj5Dv0QljLObzhopwIsF0WDQbr/Hg ps@nixos"
+    packages = with pkgs; [
+      python3 # for blog git-hook
     ];
   };
   users.groups.git = {};
@@ -155,14 +152,10 @@
   services.caddy = {
     enable = true;
     virtualHosts."psch.dev".extraConfig = ''
+      basic_auth /julius_cam/* { test $2a$14$iKv0GlwavCunG0zQbaf2fOl4r4/8k8gDKUVUouu9Q3o.MfSDkp6Te }
       root * /srv/www
       file_server
     '';
-    virtualHosts."julius.psch.dev".extraConfig = ''
-      basic_auth { test $2a$14$iKv0GlwavCunG0zQbaf2fOl4r4/8k8gDKUVUouu9Q3o.MfSDkp6Te }
-      root * /srv/julius_cam
-      file_server
-    '';
     virtualHosts."chirp.psch.dev".extraConfig = ''
       reverse_proxy http://localhost:8080 {
         request_buffers 8192
@@ -193,7 +186,7 @@
             section-from-path=1
             virtual-root=/
             module-link=/%s/commit/?id=%s
-            clone-url=https://git.psch.dev/$CGIT_REPO_URL git://psch.dev/$CGIT_REPO_URL ssh://git@psch.dev:$CGIT_REPO_URL
+            clone-url=https://git.psch.dev/$CGIT_REPO_URL git://psch.dev/$CGIT_REPO_URL ssh://git@psch.dev/~/$CGIT_REPO_URL
             noplainemail=1
             side-by-side-diffs=1
             about-filter=${pkgs.writeShellScript "markdown-filter" ''