Skip to content

Commit 10aec4c

Browse files
author
root
committed
Add :gitolite_server_host param
1 parent 224e108 commit 10aec4c

File tree

6 files changed

+16
-3
lines changed

6 files changed

+16
-3
lines changed

app/views/settings/redmine_git_hosting/_gitolite_config_ssh.html.haml

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/ Gitolite SSH Config
22
- gitolite_user = RedmineGitHosting::Config.get_setting(:gitolite_user)
3+
- gitolite_server_host = RedmineGitHosting::Config.get_setting(:gitolite_server_host)
34
- gitolite_server_port = RedmineGitHosting::Config.get_setting(:gitolite_server_port)
45
- gitolite_ssh_private_key = RedmineGitHosting::Config.get_setting(:gitolite_ssh_private_key)
56
- gitolite_ssh_public_key = RedmineGitHosting::Config.get_setting(:gitolite_ssh_public_key)
@@ -18,6 +19,10 @@
1819
%label= l(:label_gitolite_ssh_public_key)
1920
= text_field_tag 'settings[gitolite_ssh_public_key]', gitolite_ssh_public_key, size: 110
2021

22+
%p
23+
%label= l(:label_gitolite_server_host)
24+
= text_field_tag 'settings[gitolite_server_host]', gitolite_server_host, size: 20
25+
2126
%p
2227
%label= l(:label_gitolite_server_port)
2328
= text_field_tag 'settings[gitolite_server_port]', gitolite_server_port, size: 5

config/locales/settings/en.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ en:
1313
label_gitolite_user: Gitolite username
1414
label_gitolite_ssh_private_key: Gitolite SSH private key
1515
label_gitolite_ssh_public_key: Gitolite SSH public key
16-
label_gitolite_server_port: SSH local server port
16+
label_gitolite_server_host: SSH/Gitolite server host
17+
label_gitolite_server_port: SSH/Gitolite server port
1718

1819
# Gitolite Storage Config
1920
label_tab_storage: Storage

config/locales/settings/fr.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ fr:
1313
label_gitolite_user: Nom d'utilisateur Gitolite
1414
label_gitolite_ssh_private_key: Clé privée SSH de Gitolite
1515
label_gitolite_ssh_public_key: Clé publique SSH de Gitolite
16-
label_gitolite_server_port: Port du serveur SSH local
16+
label_gitolite_server_host: Adresse du serveur SSH/Gitolite
17+
label_gitolite_server_port: Port du serveur SSH/Gitolite
1718

1819
# Gitolite Storage Config
1920
label_tab_storage: Stockage

init.rb

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
:default => {
1818
# Gitolite SSH Config
1919
:gitolite_user => 'git',
20+
:gitolite_server_host => 'localhost',
2021
:gitolite_server_port => '22',
2122
:gitolite_ssh_private_key => Rails.root.join('plugins', 'redmine_git_hosting', 'ssh_keys', 'redmine_gitolite_admin_id_rsa').to_s,
2223
:gitolite_ssh_public_key => Rails.root.join('plugins', 'redmine_git_hosting', 'ssh_keys', 'redmine_gitolite_admin_id_rsa.pub').to_s,

lib/redmine_git_hosting/config/gitolite_base.rb

+5
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ def gitolite_user
3636
end
3737

3838

39+
def gitolite_server_host
40+
RedmineGitHosting::Config.get_setting(:gitolite_server_host)
41+
end
42+
43+
3944
def gitolite_server_port
4045
RedmineGitHosting::Config.get_setting(:gitolite_server_port)
4146
end

lib/redmine_git_hosting/gitolite_wrapper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def find_gitolite_wrapper(action)
9898
def gitolite_admin_settings
9999
{
100100
git_user: RedmineGitHosting::Config.gitolite_user,
101-
host: "localhost:#{RedmineGitHosting::Config.gitolite_server_port}",
101+
host: "#{RedmineGitHosting::Config.gitolite_server_host}:#{RedmineGitHosting::Config.gitolite_server_port}",
102102
author_name: RedmineGitHosting::Config.git_config_username,
103103
author_email: RedmineGitHosting::Config.git_config_email,
104104
public_key: RedmineGitHosting::Config.gitolite_ssh_public_key,

0 commit comments

Comments
 (0)