...

3 files changed, 0 insertions, 96 deletions

diff --git a/custom/ymir-nginx.nix b/custom/ymir-nginx.nix
index bc4e0a78..8cc3b47c 100644
--- a/custom/ymir-nginx.nix
+++ b/custom/ymir-nginx.nix
@@ -210,25 +210,6 @@ in {
           uwsgi_modifier1 9;
         }
       }
-      
-      server {
-        listen *:443 ssl;
-        listen [::]:443 ssl;
-        server_name ~^(.*\.)?git\.rheperire\.org$;
-
-        root ${pkgs.cgit}/cgit;
-
-        try_files $uri @cgit;
-
-        include ${favicon};
-        include ${acme};
-
-        location @cgit {
-          include ${uwsgi_params};
-          uwsgi_pass unix:/run/git.rheperire.org.sock;
-          uwsgi_modifier1 9;
-        }
-      }
 
       server {
         listen *:443 ssl;
diff --git a/ymir.nix b/ymir.nix
index 43b16803..bbc2afd2 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -11,7 +11,6 @@ let
                 "ymir.xmpp.li" "xmpp.li" "www.xmpp.li" "lists.xmpp.li" "l.xmpp.li" "muc.xmpp.li" "proxy.xmpp.li"
                 "online.yggdrasil.li" "o.yggdrasil.li" "ftp.yggdrasil.li" "files.yggdrasil.li" "f.yggdrasil.li" "ymir.yggdrasil.li" "git.yggdrasil.li" "www.yggdrasil.li" "yggdrasil.li" "lists.yggdrasil.li" "l.yggdrasil.li" "rpg.yggdrasil.li" "odin.yggdrasil.li"
                 "online.praseodym.org" "o.praseodym.org" "ftp.praseodym.org" "files.praseodym.org" "f.praseodym.org" "ymir.praseodym.org" "praseodym.org" "www.praseodym.org" "lists.praseodym.org" "l.praseodym.org" "rpg.praseodym.org"
-                "git.rheperire.org" "api.rheperire.org" "www.rheperire.org" "rheperire.org"
                 "ymir.kleen.li" "kleen.li" "www.kleen.li"
                 "ymir.nights.email" "nights.email" "www.nights.email"
               ];
@@ -316,20 +315,6 @@ in rec {
           chown-socket = "uwsgi:nginx";
           uid = "uwsgi"; gid = "uwsgi";
         };
-        "git.rheperire.org" =  {
-          type = "normal";
-          processes = 1;
-          threads = 8;
-          chdir = "${pkgs.cgit}/cgit";
-          cgi = "${pkgs.cgit}/cgit/cgit.cgi";
-          env = [
-            "CGIT_CONFIG=/etc/cgit/git.rheperire.org"
-          ];
-          socket = "/run/git.rheperire.org.sock";
-          chmod-socket = "660";
-          chown-socket = "uwsgi:nginx";
-          uid = "uwsgi"; gid = "uwsgi";
-        };
       };
     };
   };
@@ -379,44 +364,6 @@ in rec {
       scan-path=${config.services.gitolite.dataDir}/repositories
     '';
   };
-  environment.etc."cgit/git.rheperire.org" = {
-    enable = true;
-    text = ''
-      robots=noindex, nofollow
-      virtual-root=/
-      enable-git-config=1
-      remove-suffix=1
-
-      root-title=git.rheperire.org
-      root-desc=
-
-      enable-http-clone=1
-
-      enable-commit-graph=1
-      snapshots=tar tar.gz tar.bz2 tar.xz zip
-      side-by-side-diffs=1
-
-      source-filter=${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py
-      about-filter=${pkgs.cgit}/lib/cgit/filters/about-formatting.sh
-
-      readme=:README.md
-      readme=:README.txt
-      readme=:README
-      readme=:readme.md
-      readme=:readme.txt
-      readme=:readme
-
-      clone-prefix=git://git.rheperire.org https://git.rheperire.org
-
-      strict-export=git-daemon-export-ok
-      project-list=${pkgs.writeText "project-list" ''
-        rheperire.git
-        cryptoids.git
-      ''}
-      section-from-path=2
-      scan-path=${config.services.gitolite.dataDir}/repositories
-    '';
-  };
 
   services.gitolite = {
     enable = true;
@@ -826,7 +773,6 @@ in rec {
           "xmpp.li" "*.xmpp.li"
           "*.yggdrasil.li"
           "praseodym.org" "*.praseodym.org"
-          "rheperire.org" "*.rheperire.org"
           "kleen.li" "*.kleen.li"
           "nights.email" "*.nights.email"
         ];
diff --git a/ymir/zones/org.rheperire.soa b/ymir/zones/org.rheperire.soa
deleted file mode 100644
index 4b62c2e9..00000000
--- a/ymir/zones/org.rheperire.soa
+++ /dev/null
@@ -1,23 +0,0 @@
-$ORIGIN rheperire.org.
-$TTL 3600
-@ IN SOA ns.yggdrasil.li. root.yggdrasil.li. (
-  2020090300 ; serial
-  10800      ; refresh
-  3600       ; retry
-  604800     ; expire
-  3600       ; min TTL
-)
-                        IN      NS      ns.yggdrasil.li.
-                        IN      NS      ns.inwx.de.
-                        IN      NS      ns2.inwx.de.
-                        IN      NS      ns3.inwx.eu.
-
-@                       IN      A       188.68.51.254
-@                       IN      AAAA    2a03:4000:6:d004::
-@                       IN      MX      0 ymir.yggdrasil.li.
-@                       IN      TXT     "v=spf1 redirect=yggdrasil.li"
-
-*                       IN      A       188.68.51.254
-*                       IN      AAAA    2a03:4000:6:d004::
-*                       IN      MX      0 ymir.yggdrasil.li.
-*                       IN      TXT     "v=spf1 redirect=yggdrasil.li"