diff options
| author | tv <tv@krebsco.de> | 2020-09-08 22:19:15 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2020-09-08 22:19:15 +0200 |
| commit | f3aac671f823063f225096984ff8644190cf9b91 (patch) | |
| tree | c33c4e9d8da1ba419541950f110f4b4dfbf8155b /lass | |
| parent | 6fbbf7e6170f6a1ba42c5dcecd11ca67c6bc5afd (diff) | |
| parent | 549598bfd9cf6e94f8bb83ebbcc17400069f1198 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/1systems/blue/config.nix | 8 | ||||
| -rw-r--r-- | lass/1systems/prism/config.nix | 8 | ||||
| -rw-r--r-- | lass/2configs/default.nix | 1 | ||||
| -rw-r--r-- | lass/5pkgs/deploy/default.nix | 6 |
4 files changed, 11 insertions, 12 deletions
diff --git a/lass/1systems/blue/config.nix b/lass/1systems/blue/config.nix index 14f4971f7..c46bb351e 100644 --- a/lass/1systems/blue/config.nix +++ b/lass/1systems/blue/config.nix @@ -15,14 +15,6 @@ with import <stockholm/lib>; krebs.build.host = config.krebs.hosts.blue; - environment.shellAliases = { - deploy = pkgs.writeDash "deploy" '' - set -eu - export SYSTEM="$1" - $(nix-build $HOME/sync/stockholm/lass/krops.nix --no-out-link --argstr name "$SYSTEM" -A deploy) - ''; - }; - networking.nameservers = [ "1.1.1.1" ]; services.restic.backups = genAttrs [ diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index f1f14e791..33ec21e72 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -396,12 +396,12 @@ with import <stockholm/lib>; ]; } { - nix.trustedUsers = [ "Mic92" ]; - users.users.Mic92 = { - uid = genid_uint31 "Mic92"; + nix.trustedUsers = [ "mic92" ]; + users.users.mic92 = { + uid = genid_uint31 "mic92"; isNormalUser = true; openssh.authorizedKeys.keys = [ - config.krebs.users.Mic92.pubkey + config.krebs.users.mic92.pubkey ]; }; } diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index b0d7ff23b..ae2754c96 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -93,6 +93,7 @@ with import <stockholm/lib>; environment.systemPackages = with pkgs; [ #stockholm + deploy git gnumake jq diff --git a/lass/5pkgs/deploy/default.nix b/lass/5pkgs/deploy/default.nix new file mode 100644 index 000000000..c07cf20d1 --- /dev/null +++ b/lass/5pkgs/deploy/default.nix @@ -0,0 +1,6 @@ +{ writers }: +writers.writeDashBin "deploy" '' + set -eu + export SYSTEM="$1" + $(nix-build $HOME/sync/stockholm/lass/krops.nix --no-out-link --argstr name "$SYSTEM" -A deploy) +'' |