diff options
author | makefu <github@syntax-fehler.de> | 2020-09-16 21:55:09 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2020-09-16 21:55:09 +0200 |
commit | c64fb07027b49a3825b6f0814ebeb17782b8266a (patch) | |
tree | e1b4681fd93a4d3257b556dd8d579464d653ef77 /lass/1systems | |
parent | 1394ae1bd4bc3dcfb77b0daee996e75f8092fc5b (diff) | |
parent | 88a9183d1d36424977b0cd8ed513109433b779b2 (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/1systems')
-rw-r--r-- | lass/1systems/blue/config.nix | 8 | ||||
-rw-r--r-- | lass/1systems/prism/config.nix | 8 | ||||
-rw-r--r-- | lass/1systems/yellow/config.nix | 23 |
3 files changed, 26 insertions, 13 deletions
diff --git a/lass/1systems/blue/config.nix b/lass/1systems/blue/config.nix index 14f4971f..c46bb351 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 f1f14e79..33ec21e7 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/1systems/yellow/config.nix b/lass/1systems/yellow/config.nix index 82fe3fac..bc3b1f5d 100644 --- a/lass/1systems/yellow/config.nix +++ b/lass/1systems/yellow/config.nix @@ -251,6 +251,27 @@ with import <stockholm/lib>; 3f8a56ddb2e64eb67adfc9b337157ff4 -----END OpenVPN Static key V1----- </tls-auth> - ''; + + systemd.services.flix-index = { + wantedBy = [ "multi-user.target" ]; + path = [ + pkgs.coreutils + pkgs.findutils + pkgs.inotifyTools + ]; + serviceConfig = { + Restart = "always"; + ExecStart = pkgs.writers.writeDash "flix-index" '' + set -efu + + DIR=/var/download/finished + cd "$DIR" + while inotifywait -rq -e create -e move -e delete "$DIR"; do + find . -type f > "$DIR"/index.tmp + mv "$DIR"/index.tmp "$DIR"/index + done + ''; + }; + }; } |