From 459c61b01f379c08dfe54b09f9ecf15489195373 Mon Sep 17 00:00:00 2001
From: Mel <einebeere@gmail.com>
Date: Wed, 20 Nov 2024 05:10:11 +0100
Subject: Add favicon to gamja site

Signed-off-by: Mel <einebeere@gmail.com>
---
 services/cgit.nix        | 40 ++++++++++++++++++----------------------
 services/gamja.nix       | 29 -----------------------------
 services/irc/default.nix |  8 ++++++++
 services/irc/gamja.nix   | 45 +++++++++++++++++++++++++++++++++++++++++++++
 services/irc/soju.nix    | 44 ++++++++++++++++++++++++++++++++++++++++++++
 services/soju.nix        | 44 --------------------------------------------
 6 files changed, 115 insertions(+), 95 deletions(-)
 delete mode 100644 services/gamja.nix
 create mode 100644 services/irc/default.nix
 create mode 100644 services/irc/gamja.nix
 create mode 100644 services/irc/soju.nix
 delete mode 100644 services/soju.nix

(limited to 'services')

diff --git a/services/cgit.nix b/services/cgit.nix
index aeb7115..8b87f80 100644
--- a/services/cgit.nix
+++ b/services/cgit.nix
@@ -7,7 +7,7 @@ let
 
   cgit = pkgs.cgit-pink;
 
-  cgitLocalPort = "3792";
+  cgitLocalPort = 3792;
   cgitDir = "/srv/cgit";
   gitDir = "/srv/git";
 
@@ -35,26 +35,22 @@ let
 
 in
 {
-  virtualisation.oci-containers.containers = {
-    cgit = {
-      # TODO: see above. replace with `imageStream`.
-      imageFile = cgitImage;
-      image = "cgit:${cgit.version}"; # has to match `imageFile`.
-      ports = [ "127.0.0.1:${cgitLocalPort}:80"];
-
-      volumes = [
-        "${cgitDir}/config/cgitrc:/etc/cgitrc"
-        "${cgitDir}/config/lighttpd.conf:/etc/lighttpd/cgit.conf"
-        "${cgitDir}/data:/data"
-        
-        "${gitDir}:/var/www/cgit"
-      ];
-
-      entrypoint = "${pkgs.lighttpd}/bin/lighttpd";
-      cmd = [
-        "-D" # run in foreground
-        "-f" "/etc/lighttpd/cgit.conf"
-      ];
-    };
+  foundation.services.cgit = {
+    image = { imageFile = cgitImage; image = "cgit:${cgit.version}"; };
+    ports = [ [ cgitLocalPort 80 ] ];
+
+    volumes = [
+      [ "${cgitDir}/config/cgitrc" "/etc/cgitrc" ]
+      [ "${cgitDir}/config/lighttpd.conf" "/etc/lighttpd/cgit.conf" ]
+      [ "${cgitDir}/data" "/data" ]
+
+      [ "${gitDir}" "/var/www/cgit" ]
+    ];
+
+    entrypoint = "${pkgs.lighttpd}/bin/lighttpd";
+    cmd = [
+      "-D" # run in foreground
+      "-f" "/etc/lighttpd/cgit.conf"
+    ];
   };
 }
diff --git a/services/gamja.nix b/services/gamja.nix
deleted file mode 100644
index e4cc7ff..0000000
--- a/services/gamja.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ me, pkgs, ... }:
-
-let
-  socketPort = "3030";
-
-  gamjaConfig = {
-     server = {
-       url = "wss://${me.tailscale.domain}/gamja/socket";
-       auth = "mandatory";
-       nick = "mel";
-     };
-  };
-
-  gamja = pkgs.gamja.override { inherit gamjaConfig; };
-
-in
-{
-  # gamja is tailnet interal
-  services.nginx.virtualHosts.renard.locations = {
-    "/gamja" = { return = "301 $scheme://$host$request_uri/"; };
-    "/gamja/" = { alias = "${gamja}/"; };
-
-    "/gamja/socket" = {
-      proxyPass = "http://${me.tailscale.ip}:${socketPort}";
-      proxyWebsockets = true;
-      recommendedProxySettings = true;
-    };
-  };
-}
diff --git a/services/irc/default.nix b/services/irc/default.nix
new file mode 100644
index 0000000..837068a
--- /dev/null
+++ b/services/irc/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  imports = [
+    ./gamja.nix
+    ./soju.nix
+  ];
+}
diff --git a/services/irc/gamja.nix b/services/irc/gamja.nix
new file mode 100644
index 0000000..779b5b2
--- /dev/null
+++ b/services/irc/gamja.nix
@@ -0,0 +1,45 @@
+{ me, pkgs, ... }:
+
+let
+  socketPort = "3030";
+
+  gamja =
+    let
+      gamjaConfig = {
+        server = {
+          url = "wss://${me.tailscale.domain}/gamja/socket";
+          auth = "mandatory";
+          nick = "mel";
+        };
+      };
+
+      faviconHtml = ''<link rel="shortcut icon" href="/gamja/favicon.png">'';
+      gamja-override = pkgs.gamja.overrideAttrs {
+        pname = "gamja-override";
+
+        fixupPhase = ''
+          sed -i 's:</head>:${faviconHtml}</head>:g' $out/index.html
+          cp ${../../assets/favicon.png} $out/favicon.png
+        '';
+      };
+    in
+    gamja-override.override { inherit gamjaConfig; };
+
+in
+{
+  # gamja is tailnet interal
+  services.nginx.virtualHosts.renard.locations = {
+    "/gamja" = {
+      return = "301 $scheme://$host$request_uri/";
+    };
+    "/gamja/" = {
+      alias = "${gamja}/";
+    };
+
+    "/gamja/socket" = {
+      proxyPass = "http://${me.tailscale.ip}:${socketPort}";
+      proxyWebsockets = true;
+      recommendedProxySettings = true;
+    };
+  };
+}
diff --git a/services/irc/soju.nix b/services/irc/soju.nix
new file mode 100644
index 0000000..75adfaa
--- /dev/null
+++ b/services/irc/soju.nix
@@ -0,0 +1,44 @@
+{ me, pkgs, auxiliaryPkgs, ... }:
+
+let
+  inherit (pkgs) dockerTools soju;
+  inherit (auxiliaryPkgs) common;
+
+  ircPort = "6667";
+  socketPort = "3030";
+  sojuDir = "/srv/soju";
+
+  sojuImage = dockerTools.buildLayeredImage {
+    name = soju.pname;
+    tag = soju.version;
+    fromImage = common.alpine.base;
+
+    contents = [ soju ];
+
+    extraCommands = ''
+      mkdir -p ./run/soju
+    '';
+  };
+
+in
+{
+  virtualisation.oci-containers.containers = {
+    soju = {
+      imageFile = sojuImage;
+      image = "soju:${soju.version}";
+      ports = [
+        "${me.tailscale.ip}:${ircPort}:${ircPort}"
+        "${me.tailscale.ip}:${socketPort}:${socketPort}"
+      ];
+
+      volumes = [
+        "${sojuDir}/config.in:/etc/soju/config.in"
+        "${sojuDir}/soju.db:/var/lib/soju/soju.db"
+        "${sojuDir}/logs:/var/lib/soju/logs"
+      ];
+
+      entrypoint = "${soju}/bin/soju";
+      cmd = [ "-config" "/etc/soju/config.in" ];
+    };
+  };
+}
diff --git a/services/soju.nix b/services/soju.nix
deleted file mode 100644
index 75adfaa..0000000
--- a/services/soju.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ me, pkgs, auxiliaryPkgs, ... }:
-
-let
-  inherit (pkgs) dockerTools soju;
-  inherit (auxiliaryPkgs) common;
-
-  ircPort = "6667";
-  socketPort = "3030";
-  sojuDir = "/srv/soju";
-
-  sojuImage = dockerTools.buildLayeredImage {
-    name = soju.pname;
-    tag = soju.version;
-    fromImage = common.alpine.base;
-
-    contents = [ soju ];
-
-    extraCommands = ''
-      mkdir -p ./run/soju
-    '';
-  };
-
-in
-{
-  virtualisation.oci-containers.containers = {
-    soju = {
-      imageFile = sojuImage;
-      image = "soju:${soju.version}";
-      ports = [
-        "${me.tailscale.ip}:${ircPort}:${ircPort}"
-        "${me.tailscale.ip}:${socketPort}:${socketPort}"
-      ];
-
-      volumes = [
-        "${sojuDir}/config.in:/etc/soju/config.in"
-        "${sojuDir}/soju.db:/var/lib/soju/soju.db"
-        "${sojuDir}/logs:/var/lib/soju/logs"
-      ];
-
-      entrypoint = "${soju}/bin/soju";
-      cmd = [ "-config" "/etc/soju/config.in" ];
-    };
-  };
-}
-- 
cgit 1.4.1