Merge remote-tracking branch 'lassul.us/master'

5 files changed, 45 insertions, 13 deletions

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/proxy.nix b/lass/2configs/binary-cache/proxy.nix
new file mode 100644
index 000000000..a6ecb044d
--- /dev/null
+++ b/lass/2configs/binary-cache/proxy.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ...}:
+{
+  services.nginx = {
+    enable = true;
+    virtualHosts."cache.krebsco.de" = {
+      enableACME = true;
+      forceSSL = true;
+      locations."/".extraConfig = ''
+        proxy_pass http://cache.neoprism.r/;
+      '';
+    };
+  };
+}
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};
-      '';
-    };
   };
 }
 
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"
+    ];
+  };
+}
diff --git a/lass/2configs/mumble-reminder.nix b/lass/2configs/mumble-reminder.nix
index c4cc60dc5..0067d64eb 100644
--- a/lass/2configs/mumble-reminder.nix
+++ b/lass/2configs/mumble-reminder.nix
@@ -80,26 +80,26 @@ in {
   };
   systemd.services.mumble-reminder-nixos = {
     description = "weekly reminder for nixos mumble";
-    startAt = "Thu *-*-* 17:00:00 Europe/Berlin";
+    startAt = "Wed *-*-* 19:00:00 Europe/Berlin";
     serviceConfig = {
       ExecStart = pkgs.writers.writeDash "mumble_reminder" ''
         animals='
           ${animals}
         '
-        ${write_to_irc "#nixos"} "Es ist Donnerstag meine $(echo "$animals" | grep -v '^$' | shuf -n1 )!"
+        ${write_to_irc "#nixos"} "Es ist Mittwoch meine $(echo "$animals" | grep -v '^$' | shuf -n1 )!"
         ${write_to_irc "#nixos"} "kommt auf mumble://lassul.us"
       '';
     };
   };
   systemd.services.mumble-reminder-krebs = {
     description = "weekly reminder for nixos mumble";
-    startAt = "Thu *-*-* 19:00:00 Europe/Berlin";
+    startAt = "Wed *-*-* 19:00:00 Europe/Berlin";
     serviceConfig = {
       ExecStart = pkgs.writers.writeDash "mumble_reminder" ''
         animals='
           ${animals}
         '
-        ${write_to_irc "#krebs"} "Es ist Donnerstag meine $(echo "$animals" | grep -v '^$' | shuf -n1 )!"
+        ${write_to_irc "#krebs"} "Es ist Mittwoch meine $(echo "$animals" | grep -v '^$' | shuf -n1 )!"
         ${write_to_irc "#krebs"} "$(cat /var/lib/reaktor2-mumble-reminder/users | ${pkgs.findutils}/bin/xargs echo) : mumble?"
       '';
     };