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 /krebs/2configs/shack | |
| parent | 6fbbf7e6170f6a1ba42c5dcecd11ca67c6bc5afd (diff) | |
| parent | 549598bfd9cf6e94f8bb83ebbcc17400069f1198 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/2configs/shack')
| -rw-r--r-- | krebs/2configs/shack/gitlab-runner.nix | 2 | ||||
| -rw-r--r-- | krebs/2configs/shack/glados/multi/wasser.nix | 2 | ||||
| -rw-r--r-- | krebs/2configs/shack/share.nix | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/krebs/2configs/shack/gitlab-runner.nix b/krebs/2configs/shack/gitlab-runner.nix index 5f2ca02d9..bd391851a 100644 --- a/krebs/2configs/shack/gitlab-runner.nix +++ b/krebs/2configs/shack/gitlab-runner.nix @@ -14,6 +14,8 @@ in ## registrationConfigurationFile contains: # CI_SERVER_URL=<CI server URL> # REGISTRATION_TOKEN=<registration secret> + # RUNNER_TAG_LIST=nix,shacklan + # RUNNER_NAME=stockholm-runner-$name registrationConfigFile = <secrets/shackspace-gitlab-ci>; #gracefulTermination = true; }; diff --git a/krebs/2configs/shack/glados/multi/wasser.nix b/krebs/2configs/shack/glados/multi/wasser.nix index 0a7ffc41c..6f3dc98ad 100644 --- a/krebs/2configs/shack/glados/multi/wasser.nix +++ b/krebs/2configs/shack/glados/multi/wasser.nix @@ -2,7 +2,7 @@ # switch.crafting_giesskanne_relay let glados = import ../lib; - seconds = 5; + seconds = 10; wasser = "switch.crafting_giesskanne_relay"; in { diff --git a/krebs/2configs/shack/share.nix b/krebs/2configs/shack/share.nix index 247b9ee7d..465d6ef69 100644 --- a/krebs/2configs/shack/share.nix +++ b/krebs/2configs/shack/share.nix @@ -33,6 +33,10 @@ printing = bsd printcap name = /dev/null disable spoolss = yes + + # for legacy systems + client min protocol = NT1 + server min protocol = NT1 ''; }; } |