Skip to content

Commit ee3f1f1

Browse files
author
root
committed
Get rid of ENV['HOME']
1 parent 7f21411 commit ee3f1f1

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

app/views/settings/_gitolite_config_ssh.html.erb

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919

2020
<p>
2121
<label><%= l(:label_gitolite_ssh_private_key) %></label>
22-
<%= text_field_tag("settings[gitolite_ssh_private_key]", gitolite_ssh_private_key, :size => 60) %>
22+
<%= text_field_tag("settings[gitolite_ssh_private_key]", gitolite_ssh_private_key, :size => 110) %>
2323
<% if !scripts_dir_writeable %>
2424
<br /><span class="label label-warning"><%= l(:label_cannot_change_selinux) %></span>
2525
<% end %>
2626
</p>
2727

2828
<p>
2929
<label><%= l(:label_gitolite_ssh_public_key) %></label>
30-
<%= text_field_tag("settings[gitolite_ssh_public_key]", gitolite_ssh_public_key, :size => 60) %>
30+
<%= text_field_tag("settings[gitolite_ssh_public_key]", gitolite_ssh_public_key, :size => 110) %>
3131
<% if !scripts_dir_writeable %>
3232
<br /><span class="label label-warning"><%= l(:label_cannot_change_selinux) %></span>
3333
<% end %>

init.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
# Gitolite SSH Config
2222
:gitolite_user => 'git',
2323
:gitolite_server_port => '22',
24-
:gitolite_ssh_private_key => File.join(ENV['HOME'], '.ssh', 'redmine_gitolite_admin_id_rsa').to_s,
25-
:gitolite_ssh_public_key => File.join(ENV['HOME'], '.ssh', 'redmine_gitolite_admin_id_rsa.pub').to_s,
24+
:gitolite_ssh_private_key => File.join(Rails.root, 'plugins', 'redmine_git_hosting', 'ssh_keys', 'redmine_gitolite_admin_id_rsa').to_s,
25+
:gitolite_ssh_public_key => File.join(Rails.root, 'plugins', 'redmine_git_hosting', 'ssh_keys', 'redmine_gitolite_admin_id_rsa.pub').to_s,
2626

2727
# Gitolite Storage Config
2828
:gitolite_global_storage_dir => 'repositories/',
@@ -37,7 +37,7 @@
3737
:git_config_email => '[email protected]',
3838

3939
# Gitolite Global Config
40-
:gitolite_temp_dir => File.join(ENV['HOME'], 'tmp', 'redmine_git_hosting').to_s,
40+
:gitolite_temp_dir => File.join(Rails.root, 'tmp', 'redmine_git_hosting').to_s,
4141
:gitolite_scripts_dir => './',
4242
:gitolite_lock_wait_time => 10,
4343
:gitolite_recycle_bin_expiration_time => 24.0,

ssh_keys/.placeholder

Whitespace-only changes.

0 commit comments

Comments
 (0)