Permalink
Browse files

Add :gitolite_server_host param

  • Loading branch information...
n-rodriguez committed Jun 1, 2015
1 parent 224e108 commit 10aec4c1c4ea6bd71e0c8165b3b28791eb767e6f
@@ -1,5 +1,6 @@
/ Gitolite SSH Config
- gitolite_user = RedmineGitHosting::Config.get_setting(:gitolite_user)
- gitolite_server_host = RedmineGitHosting::Config.get_setting(:gitolite_server_host)
- gitolite_server_port = RedmineGitHosting::Config.get_setting(:gitolite_server_port)
- gitolite_ssh_private_key = RedmineGitHosting::Config.get_setting(:gitolite_ssh_private_key)
- gitolite_ssh_public_key = RedmineGitHosting::Config.get_setting(:gitolite_ssh_public_key)
@@ -18,6 +19,10 @@
%label= l(:label_gitolite_ssh_public_key)
= text_field_tag 'settings[gitolite_ssh_public_key]', gitolite_ssh_public_key, size: 110
%p
%label= l(:label_gitolite_server_host)
= text_field_tag 'settings[gitolite_server_host]', gitolite_server_host, size: 20
%p
%label= l(:label_gitolite_server_port)
= text_field_tag 'settings[gitolite_server_port]', gitolite_server_port, size: 5
@@ -13,7 +13,8 @@ en:
label_gitolite_user: Gitolite username
label_gitolite_ssh_private_key: Gitolite SSH private key
label_gitolite_ssh_public_key: Gitolite SSH public key
label_gitolite_server_port: SSH local server port
label_gitolite_server_host: SSH/Gitolite server host
label_gitolite_server_port: SSH/Gitolite server port
# Gitolite Storage Config
label_tab_storage: Storage
@@ -13,7 +13,8 @@ fr:
label_gitolite_user: Nom d'utilisateur Gitolite
label_gitolite_ssh_private_key: Clé privée SSH de Gitolite
label_gitolite_ssh_public_key: Clé publique SSH de Gitolite
label_gitolite_server_port: Port du serveur SSH local
label_gitolite_server_host: Adresse du serveur SSH/Gitolite
label_gitolite_server_port: Port du serveur SSH/Gitolite
# Gitolite Storage Config
label_tab_storage: Stockage
@@ -17,6 +17,7 @@
:default => {
# Gitolite SSH Config
:gitolite_user => 'git',
:gitolite_server_host => 'localhost',
:gitolite_server_port => '22',
:gitolite_ssh_private_key => Rails.root.join('plugins', 'redmine_git_hosting', 'ssh_keys', 'redmine_gitolite_admin_id_rsa').to_s,
:gitolite_ssh_public_key => Rails.root.join('plugins', 'redmine_git_hosting', 'ssh_keys', 'redmine_gitolite_admin_id_rsa.pub').to_s,
@@ -36,6 +36,11 @@ def gitolite_user
end
def gitolite_server_host
RedmineGitHosting::Config.get_setting(:gitolite_server_host)
end
def gitolite_server_port
RedmineGitHosting::Config.get_setting(:gitolite_server_port)
end
@@ -98,7 +98,7 @@ def find_gitolite_wrapper(action)
def gitolite_admin_settings
{
git_user: RedmineGitHosting::Config.gitolite_user,
host: "localhost:#{RedmineGitHosting::Config.gitolite_server_port}",
host: "#{RedmineGitHosting::Config.gitolite_server_host}:#{RedmineGitHosting::Config.gitolite_server_port}",
author_name: RedmineGitHosting::Config.git_config_username,
author_email: RedmineGitHosting::Config.git_config_email,
public_key: RedmineGitHosting::Config.gitolite_ssh_public_key,

0 comments on commit 10aec4c

Please sign in to comment.