modify ssh port to 2222 on development

parent 6f1f7585
......@@ -104,11 +104,13 @@ if node['gitlab']['env'] == "development"
default['gitlab']['url'] = "http://localhost:3000/"
default['gitlab']['revision'] = "master"
default['gitlab']['environments'] = %w{development test}
default['gitlab']['ssh_port'] = "2222"
else
default['gitlab']['environments'] = %w{production}
default['gitlab']['url'] = "http://localhost:80/"
default['gitlab']['revision'] = "6-4-stable" # Must be branch, otherwise GitLab update will run on each chef run
default['gitlab']['port'] = "80"
default['gitlab']['ssh_port'] = "22"
end
# Nginx ssl certificates
......
......@@ -26,7 +26,8 @@ template File.join(gitlab['path'], 'config', 'gitlab.yml') do
:oauth_allow_single_sign_on => gitlab['oauth_allow_single_sign_on'],
:oauth_providers => gitlab['oauth_providers'],
:google_analytics_id => gitlab['extra']['google_analytics_id'],
:sign_in_text => gitlab['extra']['sign_in_text']
:sign_in_text => gitlab['extra']['sign_in_text'],
:ssh_port => gitlab['ssh_port'],
})
notifies :run, "bash[git config]", :immediately
notifies :reload, "service[gitlab]"
......
......@@ -98,7 +98,7 @@ production: &base
# ## :project_id - GitLab project identifier
# ## :issues_tracker_id - Project Name or Id in external issue tracker
# new_issue_url: "http://redmine.sample/projects/:issues_tracker_id/issues/new"
#
#
# jira:
# title: "Atlassian Jira"
# project_url: "http://jira.sample/issues/?jql=project=:issues_tracker_id"
......@@ -180,7 +180,7 @@ production: &base
receive_pack: true
# If you use non-standard ssh port you need to specify it
# ssh_port: 22
ssh_port: <%= @ssh_port =%>
## Git settings
# CAUTION!
......@@ -197,7 +197,7 @@ production: &base
# 4. Extra customization
# ==========================
extra:
extra:
## Google analytics. Uncomment if you want it
<%= "google_analytics_id: '#{ @google_analytics_id }'" unless @google_analytics_id.empty? %>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment