From 93606315b99a2540c5859d93eb2377ae32fa6506 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 4 Aug 2020 21:25:09 +0200 Subject: shack/share: downgrade samba security --- krebs/2configs/shack/share.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'krebs') 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 ''; }; } -- cgit v1.3.1 From 57e21968fcef02ddbaf0d87a06358542232b4d90 Mon Sep 17 00:00:00 2001 From: Neos Date: Mon, 10 Aug 2020 20:16:12 +0200 Subject: Changed Gießzeit to 10 seconds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- krebs/2configs/shack/glados/multi/wasser.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') 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 { -- cgit v1.3.1 From a7f67a851b9cc2988169b96b06a9befc89de4c1c Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 12 Aug 2020 23:10:48 +0200 Subject: gitlab-ci: run only on tags we have some rogue non-nix runners going around on gitlab-ci therefore we now tag the runners shacklan - inside the shack lan nix - has nix installed --- .gitlab-ci.yml | 12 ++++++++++++ krebs/2configs/shack/gitlab-runner.nix | 2 ++ 2 files changed, 14 insertions(+) (limited to 'krebs') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf8f6e8f4..76a304af8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,8 @@ before_script: - which gpg2 - echo "$secrets_gpg_key" | gpg --import deployment test: + tags: + - nix stage: test script: - GIT_SSH_COMMAND="ssh -i ~/.ssh/gitlab_deploy.key" git clone git@ssh.git.shackspace.de:rz/secrets.git ~/brain @@ -23,6 +25,8 @@ deployment test: - $(nix-build krebs/krops.nix --no-out-link --argstr name puyak --argstr target /tmp -A test) nix-shell test: stage: test + tags: + - nix script: - nix-shell --pure --command 'true' -p stdenv && echo success - nix-shell --pure --command 'false' -p stdenv || echo success @@ -31,6 +35,9 @@ nix-shell test: - gpg --version - curl --version wolf deployment: + tags: + - shacklan + - nix stage: deploy script: - cp ~/.ssh/gitlab_deploy.key ~/.ssh/id_rsa @@ -46,6 +53,9 @@ wolf deployment: - .gitmodules puyak deployment: stage: deploy + tags: + - shacklan + - nix script: - cp ~/.ssh/gitlab_deploy.key ~/.ssh/id_rsa - git clone git@ssh.git.shackspace.de:rz/secrets.git ~/brain @@ -60,6 +70,8 @@ puyak deployment: - .gitmodules nur-packages makefu: stage: deploy + tags: + - nix script: - git reset --hard origin/master - git filter-branch -f --prune-empty --subdirectory-filter makefu/5pkgs HEAD 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= # REGISTRATION_TOKEN= + # RUNNER_TAG_LIST=nix,shacklan + # RUNNER_NAME=stockholm-runner-$name registrationConfigFile = ; #gracefulTermination = true; }; -- cgit v1.3.1