gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'remove-bb-special-settings' into 'master' 

Remove abandoned BB special settings

See merge request !1296
This commit is contained in:
Marin Jankovski 2017-02-11 12:29:11 +00:00
parent 2808fc47ac 52a4633d48
commit b87ae1fd15
4 changed files with 3 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,6 +3,9 @@
The latest version of this file can be found at the master branch of the
omnibus-gitlab repository.
9.0
- Remove Bitbucket from templates as it does not require special settings anymore
8.17.0
- Remove deprecated Elasticsearch configuration options ab660c56

11
files/gitlab-config-template/gitlab.rb.template
View File

@ -221,17 +221,6 @@ external_url 'GENERATED_EXTERNAL_URL'
# }
# ]
###! **If you setup Bitbucket importer under omniauth providers you will need to
###! add the keys which will allow connection between Bitbucket and GitLab.**
###! Docs: https://docs.gitlab.com/ce/integration/bitbucket.html
# gitlab_rails['bitbucket'] = {
# 'known_hosts_key' => 'bitbucket.org,207.223.240.182 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==',
# 'private_key' => '-----BEGIN RSA PRIVATE KEY-----
# MIIEowIBAAKCAQEAyXxYHwz2KjcwSjTREwlhYHqrf/8U0UM8ej3cqQ551gE4Wo3t
# -----END RSA PRIVATE KEY-----',
# 'public_key' => 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJfFgfDPYqN git@gitlab.example.com'
# }
### Backup Settings
###! Docs: https://docs.gitlab.com/omnibus/settings/backups.html

1
files/gitlab-cookbooks/gitlab/attributes/default.rb
View File

@ -174,7 +174,6 @@ default['gitlab']['gitlab-rails']['omniauth_auto_link_ldap_user'] = nil
default['gitlab']['gitlab-rails']['omniauth_auto_link_saml_user'] = nil
default['gitlab']['gitlab-rails']['omniauth_external_providers'] = nil
default['gitlab']['gitlab-rails']['omniauth_providers'] = []
default['gitlab']['gitlab-rails']['bitbucket'] = nil
default['gitlab']['gitlab-rails']['shared_path'] = "/var/opt/gitlab/gitlab-rails/shared"

35
files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
View File

@ -352,41 +352,6 @@ execute "clear the gitlab-rails cache" do
action :nothing
end
bitbucket_keys = node['gitlab']['gitlab-rails']['bitbucket']
unless bitbucket_keys.nil?
execute 'trust bitbucket.org fingerprint' do
command "echo '#{bitbucket_keys['known_hosts_key']}' >> #{known_hosts}"
user gitlab_user
group gitlab_group
not_if "grep '#{bitbucket_keys['known_hosts_key']}' #{known_hosts}"
end
file File.join(ssh_dir, 'bitbucket_rsa') do
content "#{bitbucket_keys['private_key']}\n"
owner gitlab_user
group gitlab_group
mode 0600
end
ssh_config_file = File.join(ssh_dir, 'config')
bitbucket_host_config = "Host bitbucket.org\n IdentityFile ~/.ssh/bitbucket_rsa\n User #{node['gitlab']['user']['username']}"
execute 'manage config for bitbucket import key' do
command "echo '#{bitbucket_host_config}' >> #{ssh_config_file}"
user gitlab_user
group gitlab_group
not_if "grep 'IdentityFile ~/.ssh/bitbucket_rsa' #{ssh_config_file}"
end
file File.join(ssh_dir, 'bitbucket_rsa.pub') do
content "#{bitbucket_keys['public_key']}\n"
owner gitlab_user
group gitlab_group
mode 0644
end
end
#
# Up to release 8.6 default config.ru was replaced with omnibus-based one.
# After 8.6 this is not necessery. We can remove this file.