summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-10-14 19:24:36 +0200
committertv <tv@shackspace.de>2015-10-14 19:24:36 +0200
commit335ea5a4c153b53e103d1b5d7c1a693c07296042 (patch)
tree820bd884e97b55d9f22783853ce6e594a3b43e88 /lass/2configs
parent96f4248b65ff1539eded24572ae1805b27c53d50 (diff)
parent69098a48472be34c5efc6ce449074482e73cbcd6 (diff)
Merge remote-tracking branch 'mors/master'
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/git.nix1
-rw-r--r--lass/2configs/go.nix21
-rw-r--r--lass/2configs/ircd.nix3
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 {