diff options
-rw-r--r-- | custom/ymir-nginx.nix | 19 | ||||
-rw-r--r-- | ymir.nix | 54 | ||||
-rw-r--r-- | ymir/zones/org.rheperire.soa | 23 |
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 { | |||
210 | uwsgi_modifier1 9; | 210 | uwsgi_modifier1 9; |
211 | } | 211 | } |
212 | } | 212 | } |
213 | |||
214 | server { | ||
215 | listen *:443 ssl; | ||
216 | listen [::]:443 ssl; | ||
217 | server_name ~^(.*\.)?git\.rheperire\.org$; | ||
218 | |||
219 | root ${pkgs.cgit}/cgit; | ||
220 | |||
221 | try_files $uri @cgit; | ||
222 | |||
223 | include ${favicon}; | ||
224 | include ${acme}; | ||
225 | |||
226 | location @cgit { | ||
227 | include ${uwsgi_params}; | ||
228 | uwsgi_pass unix:/run/git.rheperire.org.sock; | ||
229 | uwsgi_modifier1 9; | ||
230 | } | ||
231 | } | ||
232 | 213 | ||
233 | server { | 214 | server { |
234 | listen *:443 ssl; | 215 | listen *:443 ssl; |
@@ -11,7 +11,6 @@ let | |||
11 | "ymir.xmpp.li" "xmpp.li" "www.xmpp.li" "lists.xmpp.li" "l.xmpp.li" "muc.xmpp.li" "proxy.xmpp.li" | 11 | "ymir.xmpp.li" "xmpp.li" "www.xmpp.li" "lists.xmpp.li" "l.xmpp.li" "muc.xmpp.li" "proxy.xmpp.li" |
12 | "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" | 12 | "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" |
13 | "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" | 13 | "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" |
14 | "git.rheperire.org" "api.rheperire.org" "www.rheperire.org" "rheperire.org" | ||
15 | "ymir.kleen.li" "kleen.li" "www.kleen.li" | 14 | "ymir.kleen.li" "kleen.li" "www.kleen.li" |
16 | "ymir.nights.email" "nights.email" "www.nights.email" | 15 | "ymir.nights.email" "nights.email" "www.nights.email" |
17 | ]; | 16 | ]; |
@@ -316,20 +315,6 @@ in rec { | |||
316 | chown-socket = "uwsgi:nginx"; | 315 | chown-socket = "uwsgi:nginx"; |
317 | uid = "uwsgi"; gid = "uwsgi"; | 316 | uid = "uwsgi"; gid = "uwsgi"; |
318 | }; | 317 | }; |
319 | "git.rheperire.org" = { | ||
320 | type = "normal"; | ||
321 | processes = 1; | ||
322 | threads = 8; | ||
323 | chdir = "${pkgs.cgit}/cgit"; | ||
324 | cgi = "${pkgs.cgit}/cgit/cgit.cgi"; | ||
325 | env = [ | ||
326 | "CGIT_CONFIG=/etc/cgit/git.rheperire.org" | ||
327 | ]; | ||
328 | socket = "/run/git.rheperire.org.sock"; | ||
329 | chmod-socket = "660"; | ||
330 | chown-socket = "uwsgi:nginx"; | ||
331 | uid = "uwsgi"; gid = "uwsgi"; | ||
332 | }; | ||
333 | }; | 318 | }; |
334 | }; | 319 | }; |
335 | }; | 320 | }; |
@@ -379,44 +364,6 @@ in rec { | |||
379 | scan-path=${config.services.gitolite.dataDir}/repositories | 364 | scan-path=${config.services.gitolite.dataDir}/repositories |
380 | ''; | 365 | ''; |
381 | }; | 366 | }; |
382 | environment.etc."cgit/git.rheperire.org" = { | ||
383 | enable = true; | ||
384 | text = '' | ||
385 | robots=noindex, nofollow | ||
386 | virtual-root=/ | ||
387 | enable-git-config=1 | ||
388 | remove-suffix=1 | ||
389 | |||
390 | root-title=git.rheperire.org | ||
391 | root-desc= | ||
392 | |||
393 | enable-http-clone=1 | ||
394 | |||
395 | enable-commit-graph=1 | ||
396 | snapshots=tar tar.gz tar.bz2 tar.xz zip | ||
397 | side-by-side-diffs=1 | ||
398 | |||
399 | source-filter=${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py | ||
400 | about-filter=${pkgs.cgit}/lib/cgit/filters/about-formatting.sh | ||
401 | |||
402 | readme=:README.md | ||
403 | readme=:README.txt | ||
404 | readme=:README | ||
405 | readme=:readme.md | ||
406 | readme=:readme.txt | ||
407 | readme=:readme | ||
408 | |||
409 | clone-prefix=git://git.rheperire.org https://git.rheperire.org | ||
410 | |||
411 | strict-export=git-daemon-export-ok | ||
412 | project-list=${pkgs.writeText "project-list" '' | ||
413 | rheperire.git | ||
414 | cryptoids.git | ||
415 | ''} | ||
416 | section-from-path=2 | ||
417 | scan-path=${config.services.gitolite.dataDir}/repositories | ||
418 | ''; | ||
419 | }; | ||
420 | 367 | ||
421 | services.gitolite = { | 368 | services.gitolite = { |
422 | enable = true; | 369 | enable = true; |
@@ -826,7 +773,6 @@ in rec { | |||
826 | "xmpp.li" "*.xmpp.li" | 773 | "xmpp.li" "*.xmpp.li" |
827 | "*.yggdrasil.li" | 774 | "*.yggdrasil.li" |
828 | "praseodym.org" "*.praseodym.org" | 775 | "praseodym.org" "*.praseodym.org" |
829 | "rheperire.org" "*.rheperire.org" | ||
830 | "kleen.li" "*.kleen.li" | 776 | "kleen.li" "*.kleen.li" |
831 | "nights.email" "*.nights.email" | 777 | "nights.email" "*.nights.email" |
832 | ]; | 778 | ]; |
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 @@ | |||
1 | $ORIGIN rheperire.org. | ||
2 | $TTL 3600 | ||
3 | @ IN SOA ns.yggdrasil.li. root.yggdrasil.li. ( | ||
4 | 2020090300 ; serial | ||
5 | 10800 ; refresh | ||
6 | 3600 ; retry | ||
7 | 604800 ; expire | ||
8 | 3600 ; min TTL | ||
9 | ) | ||
10 | IN NS ns.yggdrasil.li. | ||
11 | IN NS ns.inwx.de. | ||
12 | IN NS ns2.inwx.de. | ||
13 | IN NS ns3.inwx.eu. | ||
14 | |||
15 | @ IN A 188.68.51.254 | ||
16 | @ IN AAAA 2a03:4000:6:d004:: | ||
17 | @ IN MX 0 ymir.yggdrasil.li. | ||
18 | @ IN TXT "v=spf1 redirect=yggdrasil.li" | ||
19 | |||
20 | * IN A 188.68.51.254 | ||
21 | * IN AAAA 2a03:4000:6:d004:: | ||
22 | * IN MX 0 ymir.yggdrasil.li. | ||
23 | * IN TXT "v=spf1 redirect=yggdrasil.li" | ||