diff options
| author | lassulus <lassulus@lassul.us> | 2020-08-19 21:16:14 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-08-19 21:16:14 +0200 |
| commit | 6538131f91ce9dbedc8efaa6c1d6196ad5b0f3d6 (patch) | |
| tree | 3ec0ff96e88b2d212e8e3c9566b66b23154fc03d /krebs | |
| parent | 03939b14e1d5820bee8c43d63b34c6e3e0e5eac4 (diff) | |
| parent | 1d78ac0d6a78048903cc159b82ec6b405b7e16ab (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs')
| -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 5f2ca02d..bd391851 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 0a7ffc41..6f3dc98a 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 247b9ee7..465d6ef6 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 ''; }; } |