From fc627d0b999edb8bb7c58f2efa7dcbe1ccb83e7d Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 26 Jan 2017 23:44:31 +0100 Subject: l 1 prism: remove obsolete nin stuff --- lass/1systems/prism.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'lass/1systems/prism.nix') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index d8980a10c..86c2c7416 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -227,6 +227,7 @@ in { }; } { + # Nin stuff users.users.nin = { uid = genid "nin"; inherit (config.krebs.users.nin) home; @@ -240,18 +241,6 @@ in { "libvirtd" ]; }; - krebs.git.rules = [ - { - user = [ config.krebs.users.nin ]; - repo = [ config.krebs.git.repos.stockholm ]; - perm = with git; push "refs/heads/nin" [ fast-forward non-fast-forward create delete merge ]; - } - ]; - krebs.repo-sync.repos.stockholm.nin = { - origin.url = "http://cgit.prism/stockholm"; - origin.ref = "heads/nin"; - mirror.url = "git@${config.networking.hostName}:stockholm"; - }; krebs.iptables.tables.nat.PREROUTING.rules = [ { v6 = false; precedence = 1000; predicate = "-d 213.239.205.240 -p tcp --dport 1337"; target = "DNAT --to-destination 192.168.122.24:22"; } ]; -- cgit v1.2.3 From c363534571075914bc4bdbab2988c809f3499300 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 26 Jan 2017 23:53:46 +0100 Subject: l 1 prism: I'm not proud of this commit --- lass/1systems/prism.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'lass/1systems/prism.nix') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 86c2c7416..386bcf812 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -316,16 +316,16 @@ in { script = pkgs.writePython2 "rup" '' #!${pkgs.python2}/bin/python t1 = """ - _. - ;=',_ () - 8===D~~ S" .--`|| - sS \__ || - __.' ( \-->|| - _=/ _./-\/ || - 8===D~~ ((\( /-' -'l || - ) |/ \\ (_)) - \\ \\ - '~ '~ + _. + ;=',_ () + 8===D~~ S" .--`|| + sS \__ || + __.' ( \-->|| + _=/ _./-\/ || + 8===D~~ ((\( /-' -'l || + ) |/ \\ (_)) + \\ \\ + '~ '~ """ print(t1) ''; -- cgit v1.2.3 From d9c5f0d8de9e49ac0b406412e781ed1390c6ece6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 30 Jan 2017 22:55:30 +0100 Subject: l 1 prism: remove obsolete public_html --- lass/1systems/prism.nix | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'lass/1systems/prism.nix') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 386bcf812..b89fcf013 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -202,20 +202,6 @@ in { ]; }; } - { - services.nginx = { - enable = true; - virtualHosts.public = { - port = 8088; - locations."~ ^/~(.+?)(/.*)?\$".extraConfig = '' - alias /home/$1/public_html$2; - ''; - }; - }; - krebs.iptables.tables.filter.INPUT.rules = [ - { predicate = "-p tcp --dport 8088"; target = "ACCEPT"; } - ]; - } { krebs.repo-sync.timerConfig = { OnCalendar = "*:0/5"; -- cgit v1.2.3 From d70028d9e788c6156ad674678734c546f1fcc246 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 30 Jan 2017 22:58:39 +0100 Subject: l 1 prism: import monitoring server --- lass/1systems/prism.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/1systems/prism.nix') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index b89fcf013..839e52f81 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -43,6 +43,7 @@ in { ../2configs/libvirt.nix ../2configs/hfos.nix ../2configs/makefu-sip.nix + ../2configs/monitoring/server.nix { users.extraGroups = { # ● systemd-tmpfiles-setup.service - Create Volatile Files and Directories -- cgit v1.2.3 From 8f4ed1af13a6ef0533f36dc22117434aea22a764 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 31 Jan 2017 16:57:56 +0100 Subject: l 1 prism: import bepasty.nix --- lass/1systems/prism.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/1systems/prism.nix') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 839e52f81..b92c8d900 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -44,6 +44,7 @@ in { ../2configs/hfos.nix ../2configs/makefu-sip.nix ../2configs/monitoring/server.nix + ../2configs/bepasty.nix { users.extraGroups = { # ● systemd-tmpfiles-setup.service - Create Volatile Files and Directories -- cgit v1.2.3 From dfa32223172e6d5324c3d186d4720461e684cd7f Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 31 Jan 2017 17:14:30 +0100 Subject: l 1 prism: protect bepasty from external ip --- lass/1systems/prism.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'lass/1systems/prism.nix') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index b92c8d900..5fa86da4d 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -44,7 +44,16 @@ in { ../2configs/hfos.nix ../2configs/makefu-sip.nix ../2configs/monitoring/server.nix - ../2configs/bepasty.nix + { + imports = [ + ../2configs/bepasty.nix + ]; + krebs.bepasty.servers."paste.r".nginx.extraConfig = '' + if ( $server_addr = "${config.krebs.build.host.nets.internet.ip4.addr}" ) { + return 403; + } + ''; + } { users.extraGroups = { # ● systemd-tmpfiles-setup.service - Create Volatile Files and Directories -- cgit v1.2.3 From 48dc0a6aa973f9c069b860bedaffdb4dd0583b08 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 3 Feb 2017 00:21:49 +0100 Subject: l 1 prism: remvoe sed-plugin from #coders bot --- lass/1systems/prism.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'lass/1systems/prism.nix') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 5fa86da4d..f9654ac4c 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -258,7 +258,6 @@ in { -XFlexibleInstances -XMultiParamTypeClasses \ -XOverloadedStrings -XFunctionalDependencies \''; in [ - sed-plugin url-title (buildSimpleReaktorPlugin "lambdabot-pl" { pattern = "^@pl (?P.*)$$"; -- cgit v1.2.3