Skip to content
Snippets Groups Projects

Updated Bitbucket OmniAuth documentation

Closed Updated Bitbucket OmniAuth documentation
rdoursenaud/gitlab-ce:omniauth-bitbucket into master
Closed username-removed-49868 requested to merge rdoursenaud/gitlab-ce:omniauth-bitbucket into master

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
doc/integration/bitbucket.md
94 102 sudo -u git -H ssh-keygen
95 103 ```
96 104
97 When asked `Enter file in which to save the key` specify the correct path, eg. `/home/git/.ssh/bitbucket_rsa`.
105 When asked `Enter file in which to save the key` specify the correct path, eg. `/var/opt/gitlab/.ssh/bitbucket_rsa` or `/home/git/.ssh/bitbucket_rsa`.
98 106 Make sure to use an **empty passphrase**.
99 107
100 108 1. Configure SSH client to use your new key:
101 109
102 110 Open the SSH configuration file of the git user.
111
112 For omnibus package:
113
114 ```sh
115 sudo editor /var/opt/gitlab/.ssh/config
  • Achilleas Pipinellis
    Achilleas Pipinellis @axil ·
    Maintainer

    I believe we should do sudo -u git editor /var/opt/gitlab/.ssh/config here, although chef will most likely set to default owner if anything gets changed.

  • Achilleas Pipinellis
    Achilleas Pipinellis @axil started a thread on the diff
    • doc/integration/bitbucket.md
    98 106 Make sure to use an **empty passphrase**.
    99 107
    100 108 1. Configure SSH client to use your new key:
    101 109
    102 110 Open the SSH configuration file of the git user.
    111
    112 For omnibus package:
    113
    114 ```sh
    115 sudo editor /var/opt/gitlab/.ssh/config
    116 ```
    117
    118 For installations from source:
    103 119
    104 120 ```sh
    105 121 sudo editor /home/git/.ssh/config
  • Achilleas Pipinellis
    Achilleas Pipinellis @axil ·
    Maintainer

    btw I followed the instructions to import, but the bitbucket button is greyed out :/

    I guess we are missing a step for omnibus packages, https://gitlab.com/gitlab-org/omnibus-gitlab/blob/1bf58842ca0d9f1d9c2162cff030d4c2a0619da7/files/gitlab-config-template/gitlab.rb.template#L94

  • username-removed-49868
    username-removed-49868 @rdoursenaud ·
    Author Contributor

    Hum, didn't look at the code. So CLI commands are useless for omnibus. Will update and squash ASAP. Thanks for your comments!

  • Achilleas Pipinellis mentioned in issue #2137 (closed)

    mentioned in issue #2137 (closed)

  • Achilleas Pipinellis
    Achilleas Pipinellis @axil ·
    Maintainer

    Relevant issue in omnibus omnibus-gitlab#699 (closed)

  • username-removed-49868
    username-removed-49868 @rdoursenaud ·
    Author Contributor

    I'm a bit short on time lately and this obviously needs a bit of time to figure out all the bits and pieces. Maybe you could only merge the first commit which is correct. I'll try and have a look to the second part as time permits. Thanks.

  • Achilleas Pipinellis
    Achilleas Pipinellis @axil ·
    Maintainer

    Yeah, we need to sort it out somehow. I'll see what to do, thanks again for taking the intiative.

  • Achilleas Pipinellis Reassigned to @axil

    Reassigned to @axil

  • username-removed-55219
    username-removed-55219 @kelvinmutuma ·
    Contributor

    Ping @axil ....Please look at this when you have some time :)

  • Achilleas Pipinellis Milestone changed to 8.4

    Milestone changed to 8.4

  • Achilleas Pipinellis
    Achilleas Pipinellis @axil ·
    Maintainer

    Note to check this article when updating the docs: http://stratus3d.com/blog/2015/09/06/migrating-from-bitbucket-to-local-gitlab-server/

  • Achilleas Pipinellis Milestone changed to 8.5

    Milestone changed to 8.5

  • Achilleas Pipinellis mentioned in issue omnibus-gitlab#1052 (closed)

    mentioned in issue omnibus-gitlab#1052 (closed)

  • Achilleas Pipinellis Milestone removed

    Milestone removed

  • username-removed-128633
    username-removed-128633 @rymai ·
    Maintainer

    @axil Could you review/merge this one?

  • Achilleas Pipinellis Milestone changed to 8.8

    Milestone changed to 8.8

  • Achilleas Pipinellis
    Achilleas Pipinellis @axil ·
    Maintainer

    @rymai this need testing! I'll tackle it for 8.8 :)

  • username-removed-128633
    username-removed-128633 @rymai ·
    Maintainer

    @axil Thanks, much appreciated!

  • username-removed-386624
    username-removed-386624 @connorshea ·
    Developer

    10,590 commits behind :)

  • Douwe Maan Milestone removed

    Milestone removed

  • Achilleas Pipinellis Milestone changed to %8.12

    Milestone changed to %8.12

  • Achilleas Pipinellis
    Achilleas Pipinellis @axil ·
    Maintainer

    Picking up and closing in favor of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6106. @rdoursenaud thanks a lot for your initial cleanup!

  • Achilleas Pipinellis Status changed to closed

    Status changed to closed

    • Please register or sign in to reply