Store mailer config in Global Git config, not the repo one

Author: root

Diff for: app/services/git_notifier.rb

@@ -7,41 +7,16 @@ class GitNotifier
   attr_reader :default_list
   attr_reader :mail_mapping
 
-  attr_reader :mailer
-  attr_reader :smtp_auth
-  attr_reader :smtp_server
-  attr_reader :smtp_port
-  attr_reader :smtp_user
-  attr_reader :smtp_pass
-
 
   def initialize(repository)
     @repository     = repository
     @project        = repository.project
+
     @email_prefix   = ''
     @sender_address = ''
     @default_list   = []
     @mail_mapping   = {}
 
-    if ActionMailer::Base.delivery_method == :smtp
-      @mailer = 'smtp'
-    else
-      @mailer = 'sendmail'
-    end
-
-    @smtp_auth =
-    if ActionMailer::Base.smtp_settings.has_key?(:authentication) &&
-      ActionMailer::Base.smtp_settings[:authentication] != :none
-      true
-    else
-      false
-    end
-
-    @smtp_server = ActionMailer::Base.smtp_settings[:address]
-    @smtp_port   = ActionMailer::Base.smtp_settings[:port]
-    @smtp_user   = ActionMailer::Base.smtp_settings[:user_name]
-    @smtp_pass   = ActionMailer::Base.smtp_settings[:password]
-
     build_notifier
   end
 

Diff for: app/views/settings/_gitolite_config_test.html.erb

@@ -60,6 +60,18 @@
     </td>
   </tr>
 
+  <tr>
+    <td><%= l(:label_gitolite_mailer_params_installed) %></td>
+    <td>
+      <% params_installed = hooks_manager.mailer_params_installed? %>
+      <% params_installed.each do |param, installed| %>
+        <%= image_tag((installed ? 'true.png' : 'exclamation.png'), :style => "vertical-align: bottom;") %>
+        <em><%= param %></em>
+        <br />
+      <% end %>
+    </td>
+  </tr>
+
   <tr>
     <td><%= l(:label_mirroring_keys_installed) %></td>
     <td><%= image_tag (RedmineGitolite::GitoliteWrapper.mirroring_keys_installed?(:reset => true) ? 'true.png' : 'exclamation.png') %></td>

Diff for: lib/redmine_gitolite/gitolite_wrapper/repositories_helper.rb

@@ -120,21 +120,9 @@ def set_mail_settings(repository, repo_conf)
 
         if repository.extra[:git_notify] && !notifier.mailing_list.empty?
           repo_conf.set_git_config("multimailhook.enabled", 'true')
-          repo_conf.set_git_config("multimailhook.environment", "gitolite")
-
           repo_conf.set_git_config("multimailhook.mailinglist", notifier.mailing_list.join(", "))
           repo_conf.set_git_config("multimailhook.from", notifier.sender_address)
           repo_conf.set_git_config("multimailhook.emailPrefix", notifier.email_prefix)
-          repo_conf.set_git_config("multimailhook.mailer", notifier.mailer)
-
-          # Set SMTP server for mail-notifications hook
-          if notifier.mailer == 'smtp'
-            repo_conf.set_git_config("multimailhook.smtpAuth", notifier.smtp_auth.to_s)
-            repo_conf.set_git_config("multimailhook.smtpServer", notifier.smtp_server)
-            repo_conf.set_git_config("multimailhook.smtpPort", notifier.smtp_port)
-            repo_conf.set_git_config("multimailhook.smtpUser", notifier.smtp_user)
-            repo_conf.set_git_config("multimailhook.smtpPass", notifier.smtp_pass)
-          end
         else
           repo_conf.set_git_config("multimailhook.enabled", 'false')
         end

Diff for: lib/redmine_gitolite/hooks.rb

@@ -29,13 +29,15 @@ def initialize
       @gitolite_hooks_dir    = File.join('$HOME', '.gitolite', 'hooks', 'common')
       @post_receive_hook_dir = File.join(@gitolite_hooks_dir, 'post-receive.d')
 
-      @global_hook_params = get_git_config_params(GITOLITE_HOOKS_NAMESPACE)
+      @global_hook_params   = get_git_config_params(GITOLITE_HOOKS_NAMESPACE)
+      @multimailhook_params = get_git_config_params('multimailhook')
+
       @gitolite_hooks_namespace = GITOLITE_HOOKS_NAMESPACE
     end
 
 
     def check_install
-      return [ hooks_installed?, hook_params_installed? ]
+      return [ hooks_installed?, hook_params_installed?, mailer_params_installed? ]
     end
 
 
@@ -77,6 +79,23 @@ def hook_params_installed?
     end
 
 
+    def mailer_params_installed?
+      params = %w(mailer environment smtpAuth smtpServer smtpPort smtpUser smtpPass)
+      current_params = get_mailer_params
+      installed = {}
+
+      params.each do |param|
+        if @multimailhook_params[param] != current_params[param]
+          installed[param] = set_git_config_param(param, current_params[param].to_s, "multimailhook")
+        else
+          installed[param] = true
+        end
+      end
+
+      return installed
+    end
+
+
     private
 
 
@@ -85,6 +104,34 @@ def logger
     end
 
 
+    def get_mailer_params
+      params = {}
+
+      params['environment'] = 'gitolite'
+
+      if ActionMailer::Base.delivery_method == :smtp
+        params['mailer'] = 'smtp'
+      else
+        params['mailer'] = 'sendmail'
+      end
+
+      auth = ActionMailer::Base.smtp_settings[:authentication]
+
+      if auth != nil && auth != '' && auth != :none
+        params['smtpAuth'] = true
+      else
+        params['smtpAuth'] = false
+      end
+
+      params['smtpServer'] = ActionMailer::Base.smtp_settings[:address]
+      params['smtpPort']   = ActionMailer::Base.smtp_settings[:port]
+      params['smtpUser']   = ActionMailer::Base.smtp_settings[:user_name] || ''
+      params['smtpPass']   = ActionMailer::Base.smtp_settings[:password] || ''
+
+      params
+    end
+
+
     ###############################
     ##                           ##
     ##         HOOKS DIR         ##