Merge remote-tracking branch 'cd/master'

3 files changed, 20 insertions, 5 deletions

diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index d63705ab6..2164b2e33 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -32,6 +32,7 @@ let
     wai-middleware-time = {};
     web-routes-wai-custom = {};
     go = {};
+    newsbot-js = {};
   };
 
   restricted-repos = mapAttrs make-restricted-repo (
diff --git a/lass/2configs/go.nix b/lass/2configs/go.nix
index 30d3e6ae5..81a02ec7c 100644
--- a/lass/2configs/go.nix
+++ b/lass/2configs/go.nix
@@ -1,5 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
+with lib;
 {
   imports = [
     ../3modules/go.nix
@@ -10,7 +11,19 @@
   lass.go = {
     enable = true;
   };
-  krebs.iptables.tables.filter.INPUT.rules = [
-    { predicate = "-i retiolum -p tcp --dport 1337"; target = "ACCEPT"; }
-  ];
+  krebs.nginx = {
+    enable = true;
+    servers.go = {
+      locations = [
+        (nameValuePair "/" ''
+          proxy_set_header Host go;
+          proxy_pass http://localhost:1337;
+        '')
+      ];
+      server-names = [
+        "go"
+        "go.retiolum"
+      ];
+    };
+  };
 }
diff --git a/lass/2configs/ircd.nix b/lass/2configs/ircd.nix
index de96ad9d6..e48bbfd3e 100644
--- a/lass/2configs/ircd.nix
+++ b/lass/2configs/ircd.nix
@@ -4,7 +4,8 @@
   krebs.iptables.tables.filter.INPUT.rules = [
     { predicate = "-i retiolum -p tcp --dport 6667"; target = "ACCEPT"; }
   ];
-  config.services.charybdis = {
+
+  services.charybdis = {
     enable = true;
     config = ''
       serverinfo {