init static.nomath.org

6 files changed, 37 insertions, 14 deletions

diff --git a/configs/default.nix b/configs/default.nix
index 4710326..992d1de 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -16,5 +16,7 @@
   security.acme.certs."code.nomath.org".webroot = "/var/lib/acme/acme-challenge";
   security.acme.certs."nomath.org".email = "aforemny@posteo.de";
   security.acme.certs."nomath.org".webroot = "/var/lib/acme/acme-challenge";
+  security.acme.certs."static.nomath.org".email = "aforemny@posteo.de";
+  security.acme.certs."static.nomath.org".webroot = "/var/lib/acme/acme-challenge";
   networking.firewall.allowedTCPPorts = [ 80 ];
 }
diff --git a/nix/sources.json b/nix/sources.json
index 71b4a98..5530bfa 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -11,10 +11,16 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/6c43a3495a11e261e5f41e5d7eda2d71dae1b2fe.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "website": {
+    "nomath-org": {
         "branch": "main",
-        "repo": "git@code.nomath.org:~/website",
-        "rev": "21b71667e42a2af1ebb22631ce956f2b95971454",
+        "repo": "git@code.nomath.org:~/nomath-org",
+        "rev": "c04b08769bce48387d68eb47e691f5235129b582",
+        "type": "git"
+    },
+    "static-nomath-org": {
+        "branch": "main",
+        "repo": "git@code.nomath.org:~/static-nomath-org",
+        "rev": "5b728019ca1c831f1eb2453545a557ac31747b5e",
         "type": "git"
     }
 }
diff --git a/pkgs/nomath-org/default.nix b/pkgs/nomath-org/default.nix
new file mode 100644
index 0000000..b7aa5ff
--- /dev/null
+++ b/pkgs/nomath-org/default.nix
@@ -0,0 +1 @@
+import "${(import ../../nix/sources.nix).nomath-org}/nomath-org.nix"
diff --git a/pkgs/nomath-website/default.nix b/pkgs/nomath-website/default.nix
deleted file mode 100644
index 197ed4e..0000000
--- a/pkgs/nomath-website/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-import "${(import ../../nix/sources.nix).website}/nomath-website.nix"
diff --git a/pkgs/static-nomath-org/default.nix b/pkgs/static-nomath-org/default.nix
new file mode 100644
index 0000000..099ecf9
--- /dev/null
+++ b/pkgs/static-nomath-org/default.nix
@@ -0,0 +1 @@
+import "${(import ../../nix/sources.nix).static-nomath-org}/static-nomath-org.nix"
diff --git a/systems/system1/configuration.nix b/systems/system1/configuration.nix
index 9910511..59e8d5f 100644
--- a/systems/system1/configuration.nix
+++ b/systems/system1/configuration.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 {
   imports = [
     <fysiweb/configs>
@@ -6,15 +6,29 @@
     ../../configs
   ];
 
-  networking.hostName = "system1";
+  config = lib.mkMerge [
+    {
+      networking.hostName = "system1";
+    }
+    {
+      fysiweb-apps.public.static-website."nomath-org".domain = "nomath.org";
+      fysiweb-apps.public.static-website."nomath-org".root = "${pkgs.nomath-org}";
+    }
+    {
+      fysiweb-apps.public.static-website."static-nomath-org".domain = "static.nomath.org";
+      fysiweb-apps.public.static-website."static-nomath-org".root = "${pkgs.static-nomath-org}";
+    }
+    {
+      fysiweb-apps.public.cgit."code-nomath-org".domain = "code.nomath.org";
 
-  fysiweb-apps.public.static-website."nomath-org".domain = "nomath.org";
-  fysiweb-apps.public.static-website."nomath-org".root = "${pkgs.nomath-website}";
+      fysiweb-apps.public.cgit."code-nomath-org".repositories."nomath-org".description = "nomath.org website";
+      fysiweb-apps.public.cgit."code-nomath-org".repositories."static-nomath-org".description = "static.nomath.org website";
 
-  fysiweb-apps.public.cgit."code-nomath-org".domain = "code.nomath.org";
-  fysiweb-apps.public.cgit."code-nomath-org".settings.max-stats = "year";
-  fysiweb-apps.public.cgit."code-nomath-org".settings.root-desc = "";
-  fysiweb-apps.public.cgit."code-nomath-org".settings.root-title = "code.nomath.org";
-
-  fysiweb-apps.public.cgit."code-nomath-org".repositories."website".description = "nomath.org website";
+      fysiweb-apps.public.cgit."code-nomath-org".settings.css = "https://static.nomath.org/cgit.css";
+      fysiweb-apps.public.cgit."code-nomath-org".settings.logo = "https://static.nomath.org/logo_cgit.png";
+      fysiweb-apps.public.cgit."code-nomath-org".settings.max-stats = "year";
+      fysiweb-apps.public.cgit."code-nomath-org".settings.root-desc = "";
+      fysiweb-apps.public.cgit."code-nomath-org".settings.root-title = "code.nomath.org";
+    }
+  ];
 }