Set git config username and email within the interface (=> removes one step in installation)

Author: root

app/views/settings/_gitolite_config_file.html.erb

@@ -3,6 +3,8 @@
   gitolite_config_file          = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_config_file)
   gitolite_config_has_admin_key = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_config_has_admin_key, true)
   gitolite_identifier_prefix    = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_identifier_prefix)
+  git_config_username           = RedmineGitolite::ConfigRedmine.get_setting(:git_config_username)
+  git_config_email              = RedmineGitolite::ConfigRedmine.get_setting(:git_config_email)
 
   disable_button = (gitolite_config_file == RedmineGitolite::Config::GITOLITE_DEFAULT_CONFIG_FILE ? true : false)
 %>
@@ -30,6 +32,20 @@
   <em><%= l(:label_gitolite_identifier_prefix_desc) %></em>
 </p>
 
+<p>
+  <label><%= l(:label_git_config_username) %></label>
+  <%= text_field_tag("settings[git_config_username]", "#{git_config_username}", :size => 60) %>
+  <br />
+  <em><%= l(:label_git_config_username_desc) %></em>
+</p>
+
+<p>
+  <label><%= l(:label_git_config_email) %></label>
+  <%= text_field_tag("settings[git_config_email]", "#{git_config_email}", :size => 60) %>
+  <br />
+  <em><%= l(:label_git_config_email_desc) %></em>
+</p>
+
 <br />
 
 <div class="git_hosting_access_box">

config/locales/plugin_settings/en.yml

@@ -34,6 +34,10 @@ en:
   label_gitolite_config_has_admin_key: Gitolite configuration file has Admin key?
   label_gitolite_identifier_prefix: Gitolite prefix
   label_gitolite_identifier_prefix_desc: (Will be used to generate SSH keys identifiers)
+  label_git_config_username: Git author name
+  label_git_config_username_desc: (Will be used as author name in commits)
+  label_git_config_email: Git author email
+  label_git_config_email_desc: (Will be used as author email in commits)
 
   # Gitolite Global Config
   label_tab_global: Global

config/locales/plugin_settings/fr.yml

@@ -34,6 +34,10 @@ fr:
   label_gitolite_config_has_admin_key: Le fichier de configuration de Gitolite a la clé d'administration.
   label_gitolite_identifier_prefix: Préfixe Gitolite
   label_gitolite_identifier_prefix_desc: (Sera utilisé pour générer les identifiants de clé SSH)
+  label_git_config_username: Nom de l'auteur Git
+  label_git_config_username_desc: (Sera utilisé comme nom de l'auteur dans les commits)
+  label_git_config_email: Email de l'auteur Git
+  label_git_config_email_desc: (Sera utilisé comme email de l'auteur dans les commits)
 
   # Gitolite Global Config
   label_tab_global: Global

init.rb

@@ -33,6 +33,8 @@
       :gitolite_config_file                  => 'gitolite.conf',
       :gitolite_config_has_admin_key         => true,
       :gitolite_identifier_prefix            => 'redmine_',
+      :git_config_username                   => 'Redmine Git Hosting',
+      :git_config_email                      => '[email protected]',
 
       # Gitolite Global Config
       :gitolite_temp_dir                     => File.join(ENV['HOME'], 'tmp', 'redmine_git_hosting').to_s,

lib/redmine_gitolite/admin.rb

@@ -20,6 +20,7 @@ def initialize(object_id, action, options)
       @lock_file_path = File.join(RedmineGitolite::Config.get_temp_dir_path, 'redmine_git_hosting_lock')
       @gitolite_debug = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_log_level) == 'debug' ? true : false
       @gitolite_timeout = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_lock_wait_time)
+      @gitolite_author  = RedmineGitolite::Config.gitolite_commit_author
 
       @object_id      = object_id
       @action         = action
@@ -109,7 +110,7 @@ def gitolite_admin_repo_clone
     def gitolite_admin_repo_commit(message = '')
       logger.info { "#{@action} : commiting to Gitolite..." }
       begin
-        @gitolite_admin.save("#{@action} : #{message}")
+        @gitolite_admin.save("#{@action} : #{message}", :author => @gitolite_author)
       rescue => e
         logger.error { "Error : #{e.message}" }
       end

lib/redmine_gitolite/config.rb

@@ -63,6 +63,16 @@ def self.gitolite_scripts_dir
     end
 
 
+    def self.git_config_username
+      RedmineGitolite::ConfigRedmine.get_setting(:git_config_username)
+    end
+
+
+    def self.git_config_email
+      RedmineGitolite::ConfigRedmine.get_setting(:git_config_email)
+    end
+
+
     GITOLITE_ADMIN_REPO = 'gitolite-admin.git'
 
     # Full Gitolite URL
@@ -76,6 +86,11 @@ def self.gitolite_admin_dir
     end
 
 
+    def self.gitolite_commit_author
+      "#{git_config_username} <#{git_config_email}>"
+    end
+
+
     def self.http_root_url
       my_root_url(false)
     end