clean up caddy config and switch url to cgit in glance

3 files changed, 31 insertions, 12 deletions

diff --git a/flake.lock b/flake.lock
index 754f637..9de70cd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -233,6 +233,22 @@
         "type": "github"
       }
     },
+    "keys-repo": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1789787816,
+        "narHash": "sha256-seSEweu5KYkVwWqLhgk5loEX/3gN+5fw35x2+dhH3ZM=",
+        "ref": "refs/heads/main",
+        "rev": "0d5e2f739dd549db5c31c23209a0bee02abec1da",
+        "revCount": 14,
+        "type": "git",
+        "url": "ssh://git@github.com/modernidiots-org/keys"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://git@github.com/modernidiots-org/keys"
+      }
+    },
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
@@ -354,10 +370,12 @@
         "fx-autoconfig": "fx-autoconfig",
         "geolite-db": "geolite-db",
         "hjem": "hjem",
+        "keys-repo": "keys-repo",
         "lanzaboote": "lanzaboote",
         "nix-index-database": "nix-index-database",
         "nixos-facter-modules": "nixos-facter-modules",
         "nixpkgs": "nixpkgs",
+        "shared_assets": "shared_assets",
         "tmux-tsunami": "tmux-tsunami",
         "uc-css-js": "uc-css-js"
       }
@@ -383,6 +401,18 @@
         "type": "github"
       }
     },
+    "shared_assets": {
+      "flake": false,
+      "locked": {
+        "path": "git+ssh:/git@ganymede:shared-assets",
+        "type": "path"
+      },
+      "original": {
+        "path": "git+ssh:/git@ganymede:shared-assets",
+        "type": "path"
+      },
+      "parent": []
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/hosts/ganymede/caddy.nix b/hosts/ganymede/caddy.nix
index 0fe2175..96efc07 100644
--- a/hosts/ganymede/caddy.nix
+++ b/hosts/ganymede/caddy.nix
@@ -84,19 +84,8 @@
           root * /media/public/www/collin
           try_files {path} {path}.html {path}/index.html
           file_server
-
-          @allowed_origins header_regexp Origin ^https?://([a-z0-9-]+\.)+(williamsfam\.us\.com|ganymede)(:[0-9]+)?$
-          header @allowed_origins Access-Control-Allow-Origin "{header.Origin}"
-          header @allowed_origins Vary "Origin"
         '';
       };
-      # "git.collin.williamsfam.us.com" = {
-      #   logFormat = lib.mkForce ''
-      #     output file /var/log/caddy/access-williamsfam.us.com.log
-      #   '';
-      #   extraConfig = ''
-      #   '';
-      # };
     };
   };
 
diff --git a/modules/services/nixos/cgit/default.nix b/modules/services/nixos/cgit/default.nix
index 0ae3256..eaa1682 100644
--- a/modules/services/nixos/cgit/default.nix
+++ b/modules/services/nixos/cgit/default.nix
@@ -101,7 +101,7 @@ in {
     '';
 
     collinux.services.glance.homelabServices."git" = {
-      url = "https://git.ganymede";
+      url = "https://git.collin.williamsfam.us.com";
       icon = "si:git";
     };
   };