From e832710a80ba5895bf6aa4cb996f79a7b7494038 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 13 Apr 2017 11:41:01 +0200 Subject: lass news: -wired_sci --- lass/2configs/newsbot-js.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/newsbot-js.nix b/lass/2configs/newsbot-js.nix index 3c6c5dc88..d38af211f 100644 --- a/lass/2configs/newsbot-js.nix +++ b/lass/2configs/newsbot-js.nix @@ -163,7 +163,6 @@ let us_math_society|http://www.ams.org/cgi-bin/content/news_items.cgi?rss=1|#news vimperator|https://sites.google.com/a/vimperator.org/www/blog/posts.xml|#news weechat|http://dev.weechat.org/feed/atom|#news - wired_sci|http://www.wired.com/category/science/feed/|#news wp_world|http://feeds.washingtonpost.com/rss/rss_blogpost|#news xkcd|https://xkcd.com/rss.xml|#news zdnet|http://www.zdnet.com/news/rss.xml|#news -- cgit v1.2.3 From 621758d990ec5c25d797ffb17f2bec4e27d54728 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 13 Apr 2017 15:25:04 +0200 Subject: l 1 prism: change nickname for #coders Reaktor --- lass/1systems/prism.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'lass') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index e5cbacfc8..8eecaa350 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -254,19 +254,20 @@ in { ]; } { - krebs.Reaktor.coders = let - lambdabot = (import (pkgs.fetchFromGitHub { - owner = "NixOS"; repo = "nixpkgs"; - rev = "a4ec1841da14fc98c5c35cc72242c23bb698d4ac"; - sha256 = "148fpw31s922hxrf28yhrci296f7c7zd81hf0k6zs05rq0i3szgy"; - }) {}).lambdabot; - in { - nickname = "reaktor-lass"; + krebs.Reaktor.coders = { + nickname = "Reaktor|lass"; channels = [ "#coders" ]; extraEnviron = { REAKTOR_HOST = "irc.hackint.org"; }; plugins = with pkgs.ReaktorPlugins; let + + lambdabot = (import (pkgs.fetchFromGitHub { + owner = "NixOS"; repo = "nixpkgs"; + rev = "a4ec1841da14fc98c5c35cc72242c23bb698d4ac"; + sha256 = "148fpw31s922hxrf28yhrci296f7c7zd81hf0k6zs05rq0i3szgy"; + }) {}).lambdabot; + lambdabotflags = '' -XStandaloneDeriving -XGADTs -XFlexibleContexts \ -XFlexibleInstances -XMultiParamTypeClasses \ -- cgit v1.2.3 From b033fd53af2bac56b4bd4b2882f64818dec9acb0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 13 Apr 2017 15:25:28 +0200 Subject: l 1 prism: add Reaktor for #retiolum --- lass/1systems/prism.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'lass') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 8eecaa350..50b222338 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -350,6 +350,18 @@ in { ]; }; } + { + krebs.Reaktor.prism = { + nickname = "Reaktor|lass"; + channels = [ "#retiolum" ]; + extraEnviron = { + REAKTOR_HOST = "ni.r"; + }; + plugins = with pkgs.ReaktorPlugins; [ + sed-plugin + ]; + }; + } ]; krebs.build.host = config.krebs.hosts.prism; -- cgit v1.2.3 From d65226176267098db98ad36d8c56cf14bea28587 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 13 Apr 2017 15:25:37 +0200 Subject: l 1 prism: update chat authorized_key --- lass/1systems/prism.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 50b222338..343c45561 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -158,7 +158,7 @@ in { } { users.users.chat.openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCkmIvB8BekIE2W24+I0gnzkvkEoeulz/zQkDUVJK4oScbIvgTYmcHzQuHJyPueTm67bJCOcYaTwEDNhcR/ZvcyiCQ7Jwa5cLDTkCkcR9LQq8ry5jMNEanvTgrnBIEcwfS7jFpyFb/PRVG6hh2bPOfP+ksFplkq1BTzKt/UTaCBwVEZqi5XuFIlq/MqJg+FIjh+wyeNR5jHtqgAhVjR+YLVNXLgtVPE+dlSfbyRQHuA9FTkUj8BxxnTdwM5Sx33S61ddik1XvRn++IYqFl68fZhzyTME7t/Mvjdz8J7ew2bF2IbJrXt37yQCAOEEp9/RC5OloA7dd/5ZJjZxSzT2HnYROILsYr3S0WV4e+H2G66ZN0ftdUCYh1o5rtY7IrSes6yHsKYbpoij1IAkRkyt2XgEH5EZCk1Omx8AY3ekW1KFIEhz2DZEfnCEjPf4AGCYZ0uy4XEztxzTDkh25TVs/tym1+96qCJ1yAxwWZDbVhS/Z6aSBpsyeDRKcak8qoWVC2dEPdYuTUmwvmo3pmGn/a4UfOLNJTn0jSRjy3kSv1hYzosN4NSYZqEylFB0ABnlqoLpX3tmWtrkiKv19S+djVGxbaaYm3hjPJfds3qCWTJWPvxPPeCE8wGXVLYqOQxa5ZPYeoTwRof5YNSbj5RFYy9sDLTlHl+U4ASTHZM5S3akQ== JuiceSSH" + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDjesiOnhpT9XgWZqw/64M5lVQg3q0k22BtMyCv+33sGX8VmfTyD11GuwSjNGf5WiswKLqFvYBQsHfDDtS3k0ZNTDncGw3Pbilm6QoCuHEyDPaQYin0P+JmkocrL/6QF5uhZVFnsXCH5wntwOa00VFGwpMgQYSfRlReRx42Pu9Jk+iJduZMRBbOMvJI68Z7iJ4DgW/1U9J4MQdCsk7QlFgUstQQfV1zk4VfVfXuxDP3hjx6Q05nDChjpmzJbFunzb7aiy/1/Sl0QhROTpvxrQLksg7yYLw4BRs9ptjehX45A2Sxi8WKOb/g5u3xJNy0X07rE+N+o5v2hS7wF0DLQdK5+4TGtO+Y+ABUCqqA+T1ynAjNBWvsgY5uD4PZjuPgCMSw0JBmIy/P0THi3v5/8Cohvfnspl7Jpf80qENMu3unvvE9EePzgSRZY1PvDjPQfkWy0yBX1yQMhHuVGke9QgaletitwuahRujml37waeUuOl8Rpz+2iV+6OIS4tfO368uLFHKWbobXTbTDXODBgxZ/IyvO7vxM2uDX/kIWaeYKrip3nSyWBYnixwrcS4vm6ZQcoejwp2KCfGQwIE4MnGYRlwcOEYjvyjLkZHDiZEivUQ0rThMYBzec8bQ08QW8oxF+NXkFKG3awt3f7TKTRkYqQcOMpFKmV24KDiwgwm0miQ== JuiceSSH" ]; } { -- cgit v1.2.3 From 48d37be5dea8c74c929bd23153361f3cf419f43e Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 14 Apr 2017 11:25:18 +0200 Subject: l 2 nixpkgs: a563923 -> 5acb454 --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index 24437d040..5309c9551 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://cgit.lassul.us/nixpkgs; - ref = "a563923"; + ref = "5acb454"; }; } -- cgit v1.2.3 From 930971c9e2c3aa601f4cd87586b987c312607bc7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 15 Apr 2017 17:16:20 +0200 Subject: lass: update realwallpaper locations --- lass/1systems/prism.nix | 2 +- lass/2configs/realwallpaper.nix | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'lass') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 343c45561..9c17c4433 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -194,7 +194,7 @@ in { ../2configs/realwallpaper.nix ]; services.nginx.virtualHosts."lassul.us".locations."/wallpaper.png".extraConfig = '' - alias /tmp/wallpaper.png; + alias /var/realwallpaper/realwallpaper.png; ''; } { diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix index cf9795071..4794823ce 100644 --- a/lass/2configs/realwallpaper.nix +++ b/lass/2configs/realwallpaper.nix @@ -13,8 +13,14 @@ in { serverAliases = [ hostname ]; - locations."/wallpaper.png".extraConfig = '' - root /tmp/; + locations."/realwallpaper.png".extraConfig = '' + root /var/realwallpaper/; + ''; + locations."/realwallpaper-sat.png".extraConfig = '' + root /var/realwallpaper/; + ''; + locations."/realwallpaper-sat-krebs.png".extraConfig = '' + root /var/realwallpaper/; ''; }; -- cgit v1.2.3 From 64ac9ab74f1cb448da51880a0776848ddd7c63b3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 15 Apr 2017 18:19:15 +0200 Subject: l 2 realwallpaper: allow only from .r --- lass/2configs/realwallpaper.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lass') diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix index 4794823ce..9e26d677c 100644 --- a/lass/2configs/realwallpaper.nix +++ b/lass/2configs/realwallpaper.nix @@ -10,6 +10,11 @@ in { krebs.realwallpaper.enable = true; services.nginx.virtualHosts.wallpaper = { + extraConfig = '' + if ( $server_addr = "${config.krebs.build.host.nets.internet.ip4.addr}" ) { + return 403; + } + ''; serverAliases = [ hostname ]; -- cgit v1.2.3 From fbc29e63da7fca719dc20df13d31402a8d9c449b Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 15 Apr 2017 18:19:45 +0200 Subject: l 2 realwallpaper: listen on .r --- lass/2configs/realwallpaper.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix index 9e26d677c..116d66276 100644 --- a/lass/2configs/realwallpaper.nix +++ b/lass/2configs/realwallpaper.nix @@ -17,6 +17,7 @@ in { ''; serverAliases = [ hostname + "${hostname}.r" ]; locations."/realwallpaper.png".extraConfig = '' root /var/realwallpaper/; -- cgit v1.2.3 From 6dfee5d766d16bd90aaf846f591c7168563554cd Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 15 Apr 2017 22:27:59 +0200 Subject: l 1 iso: enable hidden-ssh --- lass/1systems/iso.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass') diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix index 9dfbf7cb8..bee1c148f 100644 --- a/lass/1systems/iso.nix +++ b/lass/1systems/iso.nix @@ -148,5 +148,8 @@ with import ; }; }; } + { + krebs.hidden-ssh.enable = true; + } ]; } -- cgit v1.2.3 From 7ea694323bf791e6a2dae4897fefa0f09bc2a654 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 16 Apr 2017 23:32:43 +0200 Subject: l 1 mors: disable ipfs --- lass/1systems/mors.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'lass') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index c196b391a..8891d1829 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -76,10 +76,6 @@ with import ; { services.redis.enable = true; } - { - #ipfs-testing - services.ipfs.enable = true; - } { environment.systemPackages = [ pkgs.krebszones -- cgit v1.2.3 From faa8318d13a4b8932e9fd15ebae116d380ede497 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 16 Apr 2017 23:33:54 +0200 Subject: l 1 iso: make sshd work --- lass/1systems/iso.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'lass') diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix index bee1c148f..01d698c4c 100644 --- a/lass/1systems/iso.nix +++ b/lass/1systems/iso.nix @@ -15,7 +15,6 @@ with import ; krebs.enable = true; krebs.build.user = config.krebs.users.lass; krebs.build.host = config.krebs.hosts.iso; - krebs.build.source.nixos-config.symlink = "stockholm/lass/1systems/${config.krebs.buil.host.name}.nix"; } { nixpkgs.config.allowUnfree = true; @@ -122,18 +121,12 @@ with import ; { bits = 8192; type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; } ]; }; + systemd.services.sshd.wantedBy = mkForce [ "multi-user.target" ]; } { krebs.iptables = { enable = true; tables = { - nat.PREROUTING.rules = [ - { predicate = "! -i retiolum -p tcp -m tcp --dport 22"; target = "REDIRECT --to-ports 0"; precedence = 100; } - { predicate = "-p tcp -m tcp --dport 45621"; target = "REDIRECT --to-ports 22"; precedence = 99; } - ]; - nat.OUTPUT.rules = [ - { predicate = "-o lo -p tcp -m tcp --dport 45621"; target = "REDIRECT --to-ports 22"; precedence = 100; } - ]; filter.INPUT.policy = "DROP"; filter.FORWARD.policy = "DROP"; filter.INPUT.rules = [ -- cgit v1.2.3 From 6e6a01957d86bffc0ee43978f80c449355365103 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 16 Apr 2017 23:34:25 +0200 Subject: l 2: add sshn to pkgs --- lass/2configs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lass') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 69f8a681e..b53efa75d 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -151,6 +151,10 @@ with import ; p7zip unzip unrar + + (pkgs.writeDashBin "sshn" '' + ${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@" + '') ]; programs.bash = { -- cgit v1.2.3 From b6b39b69ff8cf5aea15e9d31a23c58e9a2cd5ab1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 16 Apr 2017 23:35:02 +0200 Subject: l 1 mors: enable tor --- lass/1systems/mors.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lass') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 8891d1829..d80665a6b 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -85,6 +85,12 @@ with import ; #ps vita stuff boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ]; } + { + services.tor = { + enable = true; + client.enable = true; + }; + } ]; krebs.build.host = config.krebs.hosts.mors; -- cgit v1.2.3 From 7a48255b5a88e548eaf36ecdebb66fac96a04602 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 16 Apr 2017 23:35:25 +0200 Subject: l 2: add syncthing.nix --- lass/1systems/mors.nix | 1 + lass/1systems/prism.nix | 1 + lass/2configs/syncthing.nix | 12 ++++++++++++ 3 files changed, 14 insertions(+) create mode 100644 lass/2configs/syncthing.nix (limited to 'lass') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index d80665a6b..c8d9465d5 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -25,6 +25,7 @@ with import ; ../2configs/repo-sync.nix ../2configs/ircd.nix ../2configs/logf.nix + ../2configs/syncthing.nix { #risk of rain port krebs.iptables.tables.filter.INPUT.rules = [ diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 9c17c4433..41a909f16 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -46,6 +46,7 @@ in { ../2configs/monitoring/server.nix ../2configs/monitoring/monit-alarms.nix ../2configs/paste.nix + ../2configs/syncthing.nix { imports = [ ../2configs/bepasty.nix diff --git a/lass/2configs/syncthing.nix b/lass/2configs/syncthing.nix new file mode 100644 index 000000000..cef43d1e6 --- /dev/null +++ b/lass/2configs/syncthing.nix @@ -0,0 +1,12 @@ +{ config, pkgs, ... }: +with import ; +{ + services.syncthing = { + enable = true; + useInotify = true; + }; + krebs.iptables.tables.filter.INPUT.rules = [ + { predicate = "-p tcp --dport 22000"; target = "ACCEPT";} + { predicate = "-p udp --dport 21027"; target = "ACCEPT";} + ]; +} -- cgit v1.2.3