From d36a0b9d3b9ce64283b03469fd4f577c976e3390 Mon Sep 17 00:00:00 2001
From: Nguyễn Gia Phong <cnx@loang.net>
Date: Thu, 27 Jul 2023 01:44:21 +0900
Subject: Snapshot OpenNIC stuff

I should get back on the webring impl some time soon.
---
 static.nix     | 29 +++++++++++++++++++----------
 vpsadminos.nix |  2 +-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/static.nix b/static.nix
index 6ff96aa..4bf71b4 100644
--- a/static.nix
+++ b/static.nix
@@ -75,16 +75,25 @@ in {
             add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
           '';
           forceSSL = true;
-          locations = {
-            "/".index = "index.html index.xhtml";
-            "/~mingnho/chat" = {
-              proxyPass = "http://127.0.0.1:3000";
-              proxyWebsockets = true;
-            };
-          };
+          http2 = false;
+          locations."/".index = "index.html index.xhtml";
           root = "/var/lib/www/${domain}";
         };
 
+        "khoanh.${domain}" = {
+          enableACME = true;
+          forceSSL = true;
+          locations."/".index = "index.xhtml";
+          root = "/var/lib/www/khoanh.${domain}";
+        };
+
+        "cercle.libre" = {
+          addSSL = true;
+          useACMEHost = "khoanh.${domain}";
+          locations."/".index = "index.xhtml";
+          root = "/var/lib/www/cercle.libre";
+        };
+
         "adol.pw" = {
           enableACME = true;
           forceSSL = true;
@@ -99,6 +108,8 @@ in {
           forceSSL = true;
           root = "/var/lib/www/septagram.suricrasia.online";
         };
+
+        "xrvs.geek".root = "/var/lib/www/xrvs.geek";
       } // (let aliasOpenNIC = openNIC: icann: config: {
         ${openNIC} = {
           # https://wiki.opennic.org/opennic/tls
@@ -110,9 +121,7 @@ in {
           forceSSL = true;
         } // config;
       };
-      in (aliasOpenNIC "cercle.libre" "khoanh.${domain}" {
-        root = "/var/lib/www/cercle.libre";
-      }) // (aliasOpenNIC "sinyx.indy" "cnx.gdn" {
+      in (aliasOpenNIC "sinyx.indy" "cnx.gdn" {
         root = "/var/lib/www/cnx.gdn";
       }) // (aliasOpenNIC "pix.sinyx.indy" "px.cnx.gdn" {
         locations = {
diff --git a/vpsadminos.nix b/vpsadminos.nix
index 9c5a666..009d464 100644
--- a/vpsadminos.nix
+++ b/vpsadminos.nix
@@ -10,7 +10,7 @@
 with lib;
 let nameservers = [
   "88.198.92.222" "2a01:4f8:1c0c:82c0::1" # ns1.by.de.dns.opennic.glue
-  "195.90.211.16" # ns15.de.dns.opennic.glue
+  "217.160.70.42" "2001:8d8:1801:86e7::1" # ns13.de.dns.opennic.glue
 ];
 in {
   networking.nameservers = mkDefault nameservers;
-- 
cgit 1.4.1