diff options
| author | makefu <github@syntax-fehler.de> | 2019-10-27 21:43:41 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2019-10-27 21:43:41 +0100 |
| commit | 1a55dc6a2422f7e77ee46c1c04369d73880d446b (patch) | |
| tree | c0621edae7d16ce6bc7f8ef2157384f2690fcd59 /lass | |
| parent | 9829d8ff9790c194e9acb3b50f2523d389402592 (diff) | |
| parent | f8d1d7f938fcdeb18fc2abb97c586c1cccf6fcf1 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/1systems/iso.nix | 2 | ||||
| -rw-r--r-- | lass/1systems/prism/config.nix | 5 | ||||
| -rw-r--r-- | lass/2configs/default.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/git.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/ssh-cryptsetup.nix | 2 | ||||
| -rw-r--r-- | lass/3modules/browsers.nix | 2 |
6 files changed, 2 insertions, 13 deletions
diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix index a814cc6b9..a7b9f21b3 100644 --- a/lass/1systems/iso.nix +++ b/lass/1systems/iso.nix @@ -52,8 +52,6 @@ with import <stockholm/lib>; root = { openssh.authorizedKeys.keys = [ config.krebs.users.lass.pubkey - config.krebs.users.lass-shodan.pubkey - config.krebs.users.lass-icarus.pubkey ]; }; }; diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index e957279e2..f4c011dcf 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -364,13 +364,8 @@ with import <stockholm/lib>; uid = genid "download"; openssh.authorizedKeys.keys = with config.krebs.users; [ lass.pubkey - lass-shodan.pubkey - lass-icarus.pubkey - lass-daedalus.pubkey - lass-helios.pubkey lass-android.pubkey makefu.pubkey - wine-mors.pubkey ]; }; }; diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 27242b129..dcae2f3eb 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -23,7 +23,6 @@ with import <stockholm/lib>; openssh.authorizedKeys.keys = [ config.krebs.users.lass-mors.pubkey config.krebs.users.lass-blue.pubkey - config.krebs.users.lass-xerxes.pubkey config.krebs.users.lass-yubikey.pubkey ]; }; @@ -42,7 +41,6 @@ with import <stockholm/lib>; openssh.authorizedKeys.keys = [ config.krebs.users.lass-mors.pubkey config.krebs.users.lass-blue.pubkey - config.krebs.users.lass-xerxes.pubkey config.krebs.users.lass-yubikey.pubkey ]; }; diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index ced0d7955..eba68c0bc 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -180,7 +180,7 @@ let with git // config.krebs.users; repo: singleton { - user = [ lass lass-mors lass-shodan lass-icarus lass-blue lass-xerxes ]; + user = [ lass lass-mors lass-blue lass-yubikey ]; repo = [ repo ]; perm = push "refs/*" [ non-fast-forward create delete merge ]; } ++ diff --git a/lass/2configs/ssh-cryptsetup.nix b/lass/2configs/ssh-cryptsetup.nix index c5e1c5928..f08f85b49 100644 --- a/lass/2configs/ssh-cryptsetup.nix +++ b/lass/2configs/ssh-cryptsetup.nix @@ -8,8 +8,6 @@ authorizedKeys = with config.krebs.users; [ config.krebs.users.lass-mors.pubkey config.krebs.users.lass-blue.pubkey - config.krebs.users.lass-shodan.pubkey - config.krebs.users.lass-icarus.pubkey ]; }; }; diff --git a/lass/3modules/browsers.nix b/lass/3modules/browsers.nix index ccb108f8a..0c77d4da8 100644 --- a/lass/3modules/browsers.nix +++ b/lass/3modules/browsers.nix @@ -31,7 +31,7 @@ let else let name = (lib.head sortedPaths).name; - in pkgs.writeScriptBin "browser-select2" '' + in pkgs.writeScriptBin "browser-select" '' ${config.lass.xjail-bins.${name}}/bin/${name} "$@" '' ; |