summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2018-11-29 21:18:08 +0100
committerGitHub <noreply@github.com>2018-11-29 21:18:08 +0100
commit43762227f89acb8d882475d206752987688e4a98 (patch)
tree389f2c1c0edd1dacd6460a21c2916dbf80dd4eb0 /nixos/modules
parent7b77c7ff9332c68c24f2cfb72ba716a2b89915e1 (diff)
parent3caeeabb1484358b5d6d63f346767dc1764c424a (diff)
downloadnixpkgs-43762227f89acb8d882475d206752987688e4a98.tar
nixpkgs-43762227f89acb8d882475d206752987688e4a98.tar.gz
nixpkgs-43762227f89acb8d882475d206752987688e4a98.tar.bz2
nixpkgs-43762227f89acb8d882475d206752987688e4a98.tar.lz
nixpkgs-43762227f89acb8d882475d206752987688e4a98.tar.xz
nixpkgs-43762227f89acb8d882475d206752987688e4a98.tar.zst
nixpkgs-43762227f89acb8d882475d206752987688e4a98.zip
Merge pull request #49385 from krav/gitlab-shell-authorized-keys
gitlab-shell: 8.3.3->8.4.1, fix hardcoded paths
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/misc/gitlab.nix4
1 files changed, 0 insertions, 4 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 07adf58c9b2..769a9526cf6 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -609,10 +609,6 @@ in {
           touch "${cfg.statePath}/db-seeded"
         fi
 
-        # The gitlab:shell:setup regenerates the authorized_keys file so that
-        # the store path to the gitlab-shell in it gets updated
-        ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H force=yes ${gitlab-rake}/bin/gitlab-rake gitlab:shell:setup
-
         # The gitlab:shell:create_hooks task seems broken for fixing links
         # so we instead delete all the hooks and create them anew
         rm -f ${cfg.statePath}/repositories/**/*.git/hooks