From 09ea83f427d51d8b98ffb762d5cd16a3fe1be80c Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Mon, 3 Apr 2023 18:59:13 +0200
Subject: l aergia.r: remove legacy hidpi

---
 lass/1systems/aergia/physical.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/aergia/physical.nix b/lass/1systems/aergia/physical.nix
index 023639083..692f68dcc 100644
--- a/lass/1systems/aergia/physical.nix
+++ b/lass/1systems/aergia/physical.nix
@@ -87,7 +87,6 @@
 
   # textsize
   services.xserver.dpi = 200;
-  hardware.video.hidpi.enable = lib.mkDefault true;
 
   # corectrl
   programs.corectrl = {
-- 
cgit v1.3.1


From 6cb7fb16a1e4b9a70fc4668dd1c9db19a3ea1c5c Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Wed, 19 Apr 2023 17:49:09 +0200
Subject: l binary-cache: split into server & proxy, add neoprism

---
 lass/1systems/prism/config.nix        |  1 +
 lass/2configs/binary-cache/client.nix |  1 +
 lass/2configs/binary-cache/server.nix | 10 +---------
 3 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 2e82fae6f..e1f92c51e 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -127,6 +127,7 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/exim-smarthost.nix>
     <stockholm/lass/2configs/privoxy-retiolum.nix>
     <stockholm/lass/2configs/binary-cache/server.nix>
+    <stockholm/lass/2configs/binary-cache/proxy.nix>
     <stockholm/lass/2configs/iodined.nix>
     <stockholm/lass/2configs/paste.nix>
     <stockholm/lass/2configs/syncthing.nix>
diff --git a/lass/2configs/binary-cache/client.nix b/lass/2configs/binary-cache/client.nix
index b0e0a8b88..de15aff92 100644
--- a/lass/2configs/binary-cache/client.nix
+++ b/lass/2configs/binary-cache/client.nix
@@ -4,6 +4,7 @@
   nix = {
     binaryCaches = [
       "http://cache.prism.r"
+      "http://cache.neoprism.r"
       "https://cache.nixos.org/"
     ];
     binaryCachePublicKeys = [
diff --git a/lass/2configs/binary-cache/server.nix b/lass/2configs/binary-cache/server.nix
index 30bef5137..bdd568c15 100644
--- a/lass/2configs/binary-cache/server.nix
+++ b/lass/2configs/binary-cache/server.nix
@@ -14,7 +14,7 @@
   services.nginx = {
     enable = true;
     virtualHosts.nix-serve = {
-      serverAliases = [ "cache.prism.r" ];
+      serverAliases = [ "cache.${config.networking.hostName}.r" ];
       locations."/".extraConfig = ''
         proxy_pass http://localhost:${toString config.services.nix-serve.port};
       '';
@@ -26,14 +26,6 @@
         ''};
       '';
     };
-    virtualHosts."cache.krebsco.de" = {
-      forceSSL = true;
-      serverAliases = [ "cache.lassul.us" ];
-      enableACME = true;
-      locations."/".extraConfig = ''
-        proxy_pass http://localhost:${toString config.services.nix-serve.port};
-      '';
-    };
   };
 }
 
-- 
cgit v1.3.1


From 685a59210a4dd2f254d9c6d98267d1fb8c9a2333 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sun, 23 Apr 2023 12:36:04 +0200
Subject: l neoprism.r: add gsm-wiki

---
 lass/1systems/neoprism/config.nix |  1 +
 lass/2configs/gsm-wiki.nix        | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 lass/2configs/gsm-wiki.nix

(limited to 'lass/1systems')

diff --git a/lass/1systems/neoprism/config.nix b/lass/1systems/neoprism/config.nix
index cc08070af..7b402f8a6 100644
--- a/lass/1systems/neoprism/config.nix
+++ b/lass/1systems/neoprism/config.nix
@@ -4,6 +4,7 @@
   imports = [
     <stockholm/lass>
     <stockholm/lass/2configs/retiolum.nix>
+    <stockholm/lass/2configs/gsm-wiki.nix>
 
     # sync-containers
     <stockholm/lass/2configs/consul.nix>
diff --git a/lass/2configs/gsm-wiki.nix b/lass/2configs/gsm-wiki.nix
new file mode 100644
index 000000000..69508a155
--- /dev/null
+++ b/lass/2configs/gsm-wiki.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+{
+  services.nginx.virtualHosts."docs.c3gsm.de" = {
+    forceSSL = true;
+    enableACME = true;
+    locations."/".extraConfig = ''
+      auth_basic "Restricted Content";
+      auth_basic_user_file ${pkgs.writeText "flix-user-pass" ''
+        c3gsm:$apr1$q9OrPI4C$7AY4EIp3J2Xc4eLMbPGE21
+      ''};
+      root /srv/http/docs.c3gsm.de;
+    '';
+  };
+
+  users.users.c3gsm-docs = {
+    isNormalUser = true;
+    home = "/srv/http/docs.c3gsm.de";
+    createHome = true;
+    homeMode = "750";
+    useDefaultShell = true;
+    group = "nginx";
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAlW1fvCrVXhVH/z76fXBWYR/qyecYTE9VOOkFLJ6OwG user@osmocom-dev"
+    ];
+  };
+}
-- 
cgit v1.3.1