buildot-stockholm: listen on build.r

krebs/1systems/hotdog/config.nix

@@ -14,6 +14,7 @@
     <stockholm/krebs/2configs/ircd.nix>
     <stockholm/krebs/2configs/nscd-fix.nix>
     <stockholm/krebs/2configs/reaktor2.nix>
+    <stockholm/krebs/2configs/wiki.nix>
   ];
 
   krebs.build.host = config.krebs.hosts.hotdog;

krebs/2configs/buildbot-stockholm.nix

@@ -5,7 +5,7 @@
   services.nginx = {
     enable = true;
     virtualHosts.build = {
-      serverAliases = [ "build.${config.networking.hostName}.r" ];
+      serverAliases = [ "build.r" "build.${config.networking.hostName}.r" ];
       locations."/".extraConfig = ''
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";

krebs/2configs/wiki.nix

@@ -0,0 +1,19 @@
+{ config, ... }:
+
+{
+  services.gollum = {
+    enable = true;
+  };
+  networking.firewall.allowedTCPPorts = [ 80 ];
+  services.nginx = {
+    enable = true;
+    virtualHosts.wiki = {
+      serverAliases = [ "wiki.r" "wiki.${config.networking.hostName}.r" ];
+      locations."/".extraConfig = ''
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_pass http://127.0.0.1:${toString config.services.gollum.port};
+      '';
+    };
+  };
+}

krebs/3modules/krebs/default.nix

@@ -74,6 +74,8 @@ in {
             "build.hotdog.r"
             "cgit.hotdog.r"
             "irc.r"
+            "wiki.r"
+            "wiki.hotdog.r"
           ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----