diff options
| author | tv <tv@shackspace.de> | 2015-07-19 11:18:15 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-07-19 11:18:15 +0200 |
| commit | 5c52fb9e917e2d6503e37fddcc33271e5238d02a (patch) | |
| tree | c109e79f39e87c9a190c9bbc351bcd51fb2e747f /2configs | |
| parent | f60da30b80ccd6eed32cff277b3d4c84ce12b25d (diff) | |
| parent | 70711515910f5627262f0da0270ab76024811c20 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to '2configs')
| -rw-r--r-- | 2configs/lass/git-repos.nix | 10 | ||||
| -rw-r--r-- | 2configs/lass/ircd.nix | 4 | ||||
| -rw-r--r-- | 2configs/lass/steam.nix | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/2configs/lass/git-repos.nix b/2configs/lass/git-repos.nix index 94ab6317d..c0c305b85 100644 --- a/2configs/lass/git-repos.nix +++ b/2configs/lass/git-repos.nix @@ -121,10 +121,20 @@ in { imports = [ ../../3modules/tv/git.nix + ../../3modules/lass/iptables.nix ]; tv.git = { enable = true; inherit repos rules users; }; + + lass.iptables = { + tables = { + filter.INPUT.rules = [ + { predicate = "-i retiolum -p tcp --dport 80"; target = "ACCEPT"; } + ]; + }; + }; + } diff --git a/2configs/lass/ircd.nix b/2configs/lass/ircd.nix index c57f7dd5c..f71b769fd 100644 --- a/2configs/lass/ircd.nix +++ b/2configs/lass/ircd.nix @@ -83,6 +83,10 @@ channel_target_change = yes; disable_local_channels = no; }; + general { + #maybe we want ident someday? + disable_auth = yes; + }; ''; }; } diff --git a/2configs/lass/steam.nix b/2configs/lass/steam.nix index d54873b1f..7d088fc6a 100644 --- a/2configs/lass/steam.nix +++ b/2configs/lass/steam.nix @@ -12,6 +12,7 @@ ##TODO: make steam module hardware.opengl.driSupport32Bit = true; + nixpkgs.config.steam.java = true; environment.systemPackages = with pkgs; [ steam ]; |