diff options
Diffstat (limited to 'lass/2configs')
-rw-r--r-- | lass/2configs/base.nix | 2 | ||||
-rw-r--r-- | lass/2configs/bitlbee.nix | 3 | ||||
-rw-r--r-- | lass/2configs/git.nix | 1 | ||||
-rw-r--r-- | lass/2configs/go.nix | 21 | ||||
-rw-r--r-- | lass/2configs/ircd.nix | 21 |
5 files changed, 34 insertions, 14 deletions
diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 43c4f4e3..7fdc643a 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -44,7 +44,7 @@ with lib; build.source = { git.nixpkgs = { url = https://github.com/Lassulus/nixpkgs; - rev = "e916273209560b302ab231606babf5ce1c481f08"; + rev = "b9270a2e8ac3d2cf4c95075a9529528aa1d859da"; }; }; }; diff --git a/lass/2configs/bitlbee.nix b/lass/2configs/bitlbee.nix index 3a008040..fa14c7fe 100644 --- a/lass/2configs/bitlbee.nix +++ b/lass/2configs/bitlbee.nix @@ -8,8 +8,9 @@ in { ../3modules/bitlbee.nix ]; - config.lass.bitlbee = { + lass.bitlbee = { enable = true; bitlbeePkg = lpkgs.bitlbee; + portNumber = 6666; }; } diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index d63705ab..2164b2e3 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 30d3e6ae..81a02ec7 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 de96ad9d..4d2c134b 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 { @@ -45,24 +46,28 @@ class "users" { ping_time = 2 minutes; - number_per_ident = 200; - number_per_ip = 200; - number_per_ip_global = 500; + number_per_ident = 10; + number_per_ip = 2048; + number_per_ip_global = 4096; cidr_ipv4_bitlen = 24; cidr_ipv6_bitlen = 64; - number_per_cidr = 9000; - max_number = 10000; - sendq = 400 kbytes; + number_per_cidr = 65536; + max_number = 3000; + sendq = 1 megabyte; }; exempt { ip = "127.0.0.1"; }; + exempt { + ip = "10.243.0.0/16"; + }; + auth { user = "*@*"; class = "users"; - flags = exceed_limit; + flags = kline_exempt, exceed_limit, flood_exempt; }; channel { |