Skip to content

GitLab

Merged
Created by Administrator@rootOwner

Allow to configure gitlab_shell_secret location

Created by: jirutka

Loading
Loading
  • Administrator
    Administrator @root ·
    Owner

    Created by: TeatroIO

    I've prepared a stage to preview changes. Open stage or view logs.

    By Administrator on 2015-02-16T12:37:14 (imported from GitLab project)

  • Administrator
    Administrator @root started a thread on commit ed3298fc
    config/initializers/1_settings.rb
    Unable to load the diff
  • Administrator
    Administrator @root started a thread on commit ed3298fc
    config/initializers/gitlab_shell_secret_token.rb
    Unable to load the diff
  • Administrator
    Administrator @root started a thread on commit ed3298fc
    config/initializers/gitlab_shell_secret_token.rb
    14 13 File.write(secret_file, token)
    15 14 end
    16 15
    17 if File.exist?(Gitlab.config.gitlab_shell.path) && !File.exist?(gitlab_shell_symlink)
    18 FileUtils.symlink(secret_file, gitlab_shell_symlink)
    16 link_path = File.join(Gitlab.config.gitlab_shell.path, '.gitlab_shell_secret')
    • Administrator
      Administrator @root ·
      Owner

      Created by: maxlazio

      What is the intention of this TODO?

      By Administrator on 2015-05-16T19:46:13 (imported from GitLab project)

  • Administrator
    Administrator @root started a thread on commit ed3298fc
    config/initializers/gitlab_shell_secret_token.rb
    14 13 File.write(secret_file, token)
    15 14 end
    16 15
    17 if File.exist?(Gitlab.config.gitlab_shell.path) && !File.exist?(gitlab_shell_symlink)
    18 FileUtils.symlink(secret_file, gitlab_shell_symlink)
    16 link_path = File.join(Gitlab.config.gitlab_shell.path, '.gitlab_shell_secret')
    • Administrator
      Administrator @root ·
      Owner

      Created by: jirutka

      When you set the same secret_path in gitlab and gitlab-shell, then there’s no need for symlink.

      By Administrator on 2015-05-16T19:46:13 (imported from GitLab project)

  • Administrator
    Administrator @root started a thread on commit ed3298fc
    config/initializers/gitlab_shell_secret_token.rb
    14 13 File.write(secret_file, token)
    15 14 end
    16 15
    17 if File.exist?(Gitlab.config.gitlab_shell.path) && !File.exist?(gitlab_shell_symlink)
    18 FileUtils.symlink(secret_file, gitlab_shell_symlink)
    16 link_path = File.join(Gitlab.config.gitlab_shell.path, '.gitlab_shell_secret')
    • Administrator
      Administrator @root ·
      Owner

      Created by: jirutka

      To be honest, I still can’t understand why the heck someone has chosen to create symlink instead of simply using the same path…

      By Administrator on 2015-05-16T19:46:13 (imported from GitLab project)

  • Administrator
    Administrator @root started a thread on commit ed3298fc
    config/initializers/gitlab_shell_secret_token.rb
    14 13 File.write(secret_file, token)
    15 14 end
    16 15
    17 if File.exist?(Gitlab.config.gitlab_shell.path) && !File.exist?(gitlab_shell_symlink)
    18 FileUtils.symlink(secret_file, gitlab_shell_symlink)
    16 link_path = File.join(Gitlab.config.gitlab_shell.path, '.gitlab_shell_secret')
    • Administrator
      Administrator @root ·
      Owner

      Created by: maxlazio

      I understand your confusion there. This was done because we cannot assume that the users who run gitlab and gitlab-shell has access to the directory where the file resides.

      By Administrator on 2015-05-16T19:46:13 (imported from GitLab project)

  • Administrator
    Administrator @root started a thread on commit ed3298fc
    config/initializers/gitlab_shell_secret_token.rb
    14 13 File.write(secret_file, token)
    15 14 end
    16 15
    17 if File.exist?(Gitlab.config.gitlab_shell.path) && !File.exist?(gitlab_shell_symlink)
    18 FileUtils.symlink(secret_file, gitlab_shell_symlink)
    16 link_path = File.join(Gitlab.config.gitlab_shell.path, '.gitlab_shell_secret')
    • Administrator
      Administrator @root ·
      Owner

      Created by: jirutka

      Well, then you cannot assume that the user who run gitlab and gitlab-shell has read permission for the .gitlab_shell_secret… Symlink has the same permissions as the symlinked file.

      You assume that gitlab and gitlab-shell are installed in /home/git all over the place, so why not just put .gitlab_shell_secret into /home/git as default? It’s simpler and more logical.

      By Administrator on 2015-05-16T19:46:13 (imported from GitLab project)

  • Administrator
    Administrator @root started a thread on commit ed3298fc
    config/initializers/gitlab_shell_secret_token.rb
    14 13 File.write(secret_file, token)
    15 14 end
    16 15
    17 if File.exist?(Gitlab.config.gitlab_shell.path) && !File.exist?(gitlab_shell_symlink)
    18 FileUtils.symlink(secret_file, gitlab_shell_symlink)
    16 link_path = File.join(Gitlab.config.gitlab_shell.path, '.gitlab_shell_secret')
    • Administrator
      Administrator @root ·
      Owner

      Created by: jvanbaarsen

      @maxlazio What did you decide about this TODO? Is it something that has to be removed? Or can it stay there? I prefer removing it.

      By Administrator on 2015-05-16T19:46:13 (imported from GitLab project)

  • Administrator
    Administrator @root started a thread on commit ed3298fc
    config/initializers/gitlab_shell_secret_token.rb
    14 13 File.write(secret_file, token)
    15 14 end
    16 15
    17 if File.exist?(Gitlab.config.gitlab_shell.path) && !File.exist?(gitlab_shell_symlink)
    18 FileUtils.symlink(secret_file, gitlab_shell_symlink)
    16 link_path = File.join(Gitlab.config.gitlab_shell.path, '.gitlab_shell_secret')
    • Administrator
      Administrator @root ·
      Owner

      Created by: jirutka

      @jvanbaarsen If this TODO is the reason why it’s not merged yet, I’ll just remove it.

      By Administrator on 2015-05-16T19:46:13 (imported from GitLab project)

  • Administrator
    Administrator @root started a thread on commit ed3298fc
    config/initializers/gitlab_shell_secret_token.rb
    14 13 File.write(secret_file, token)
    15 14 end
    16 15
    17 if File.exist?(Gitlab.config.gitlab_shell.path) && !File.exist?(gitlab_shell_symlink)
    18 FileUtils.symlink(secret_file, gitlab_shell_symlink)
    16 link_path = File.join(Gitlab.config.gitlab_shell.path, '.gitlab_shell_secret')
    • Administrator
      Administrator @root ·
      Owner

      Created by: jvanbaarsen

      Let's wait and see what @maxlazio says about this ok?

      By Administrator on 2015-05-16T21:47:03 (imported from GitLab project)

  • Administrator
    Administrator @root started a thread on commit ed3298fc
    config/initializers/gitlab_shell_secret_token.rb
    14 13 File.write(secret_file, token)
    15 14 end
    16 15
    17 if File.exist?(Gitlab.config.gitlab_shell.path) && !File.exist?(gitlab_shell_symlink)
    18 FileUtils.symlink(secret_file, gitlab_shell_symlink)
    16 link_path = File.join(Gitlab.config.gitlab_shell.path, '.gitlab_shell_secret')
    • Administrator
      Administrator @root ·
      Owner

      Created by: jirutka

      Why? It doesn’t matter, I’ve already removed this TODO note. Look, today it’s exactly 3 months since I’ve opened this PR. I want it to be finally merged.

      By Administrator on 2015-05-16T21:50:44 (imported from GitLab project)

Please register or sign in to reply