summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/mors/config.nix3
-rw-r--r--lass/2configs/git.nix4
-rw-r--r--lass/2configs/reaktor-coders.nix6
-rw-r--r--lass/krops.nix16
4 files changed, 20 insertions, 9 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 90e04cad1..5a9c26b9d 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -40,6 +40,9 @@ with import <stockholm/lib>;
{ predicate = "-p tcp --dport 11100"; target = "ACCEPT"; }
#chromecast
{ predicate = "-p udp -m multiport --sports 32768:61000 -m multiport --dports 32768:61000"; target = "ACCEPT"; }
+ #quake3
+ { predicate = "-p tcp --dport 27950:27965"; target = "ACCEPT"; }
+ { predicate = "-p udp --dport 27950:27965"; target = "ACCEPT"; }
];
}
{
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 011c6022c..caa7c3065 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -38,6 +38,10 @@ let
cgit.desc = "take a description of your disk layout and produce a format script";
cgit.section = "software";
};
+ krebspage = {
+ cgit.desc = "homepage of krebs";
+ cgit.section = "configuration";
+ };
news = {
cgit.desc = "take a rss feed and a timeout and print it to stdout";
cgit.section = "software";
diff --git a/lass/2configs/reaktor-coders.nix b/lass/2configs/reaktor-coders.nix
index 86877df7a..9365582b8 100644
--- a/lass/2configs/reaktor-coders.nix
+++ b/lass/2configs/reaktor-coders.nix
@@ -106,6 +106,12 @@ with import <stockholm/lib>;
exec echo '¯\_(ツ)_/¯'
'';
})
+ (buildSimpleReaktorPlugin "flip" {
+ pattern = "^!flip$";
+ script = pkgs.writeDash "shrug" ''
+ exec echo '(╯°□°)╯ ┻━┻'
+ '';
+ })
];
};
}
diff --git a/lass/krops.nix b/lass/krops.nix
index 776a3a55d..c5a932206 100644
--- a/lass/krops.nix
+++ b/lass/krops.nix
@@ -1,4 +1,4 @@
-{ config ? config, name }: let
+{ name }: let
inherit (import ../krebs/krops.nix { inherit name; })
krebs-source
lib
@@ -10,7 +10,7 @@
{
nixos-config.symlink = "stockholm/lass/1systems/${name}/physical.nix";
secrets = if test then {
- file = "/home/lass/stockholm/lass/2configs/tests/dummy-secrets";
+ file = toString ./2configs/tests/dummy-secrets;
} else {
pass = {
dir = "${lib.getEnv "HOME"}/.password-store";
@@ -30,13 +30,11 @@ in {
# usage: $(nix-build --no-out-link --argstr name HOSTNAME -A test)
test = pkgs.krops.writeTest "${name}-test" {
source = source { test = true; };
- target = "${lib.getEnv "HOME"}/tmp/${name}-krops-test-src";
+ target = "${lib.getEnv "HOME"}/tmp/${name}-stockholm-test";
};
- ci = map (host:
- pkgs.krops.writeTest "${host.name}-test" {
- source = source { test = true; };
- target = "${lib.getEnv "TMPDIR"}/lass/${host.name}";
- }
- ) (lib.filter (host: lib.getAttr "ci" host && host.owner == "lass") (lib.attrValues config.krebs.hosts));
+ ci = pkgs.krops.writeTest "${name}-test" {
+ source = source { test = true; };
+ target = "${lib.getEnv "HOME"}/stockholm-build";
+ };
}