diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-10-07 09:18:33 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-10-07 09:18:33 +0000 |
| commit | 10addd5ca6995220ea3a6a00fb5af3cff1f66449 (patch) | |
| tree | f8e3a916e3df04b81cf71a0dab9dcc39d55ab102 /deployment/mgagit | |
| parent | ac1da3a9e748f0df9b67aca2781e86e1e7ed665e (diff) | |
| download | puppet-10addd5ca6995220ea3a6a00fb5af3cff1f66449.tar puppet-10addd5ca6995220ea3a6a00fb5af3cff1f66449.tar.gz puppet-10addd5ca6995220ea3a6a00fb5af3cff1f66449.tar.bz2 puppet-10addd5ca6995220ea3a6a00fb5af3cff1f66449.tar.xz puppet-10addd5ca6995220ea3a6a00fb5af3cff1f66449.zip | |
mgagit: Convert to git multimail for notifications.
This system sends one mail per commit pushed, all threaded (i.e. as replies)
to a summary email of the push itself.
Upstream URL for git multimail is: https://github.com/mhagger/git-multimail
Diffstat (limited to 'deployment/mgagit')
| -rw-r--r-- | deployment/mgagit/manifests/init.pp | 8 | ||||
| -rw-r--r-- | deployment/mgagit/templates/gitolite.rc | 2 | ||||
| -rw-r--r-- | deployment/mgagit/templates/group_owned_repo.gl | 11 | ||||
| -rw-r--r-- | deployment/mgagit/templates/repodef_repo.gl | 7 |
4 files changed, 17 insertions, 11 deletions
diff --git a/deployment/mgagit/manifests/init.pp b/deployment/mgagit/manifests/init.pp index b88efbbe..3ca7225f 100644 --- a/deployment/mgagit/manifests/init.pp +++ b/deployment/mgagit/manifests/init.pp @@ -45,6 +45,14 @@ class mgagit( content => template('mgagit/format-commit-email.sh'), } + mga_common::local_script { 'git_multimail.py': + content => template('mgagit/git_multimail.py'), + } + + mga_common::local_script { 'mgagit-post-receive-hook': + content => template('mgagit/git-post-receive-hook'), + } + file { $gitolite_tmpldir: ensure => directory, owner => root, diff --git a/deployment/mgagit/templates/gitolite.rc b/deployment/mgagit/templates/gitolite.rc index e498cf6e..7afeda6b 100644 --- a/deployment/mgagit/templates/gitolite.rc +++ b/deployment/mgagit/templates/gitolite.rc @@ -21,7 +21,7 @@ UMASK => 0022, # look for "git-config" in the documentation - GIT_CONFIG_KEYS => 'gitweb\.description gitweb\.owner hooks\.mailinglist hooks\.emailprefix hooks\.envelopesender hooks\.showrev', + GIT_CONFIG_KEYS => 'gitweb\.description gitweb\.owner hooks\.mailinglist hooks\.emailprefix hooks\.envelopesender hooks\.showrev multimailhook\.mailinglist multimailhook\.emailDomain multimailhook\.envelopeSender', # comment out if you don't need all the extra detail in the logfile LOG_EXTRA => 1, diff --git a/deployment/mgagit/templates/group_owned_repo.gl b/deployment/mgagit/templates/group_owned_repo.gl index ff5e3a02..18e7db49 100644 --- a/deployment/mgagit/templates/group_owned_repo.gl +++ b/deployment/mgagit/templates/group_owned_repo.gl @@ -20,17 +20,16 @@ repo [% repo %] RW+ user/USER/ = @all R = @all [% IF r.repos.$repo.noemail -%] - config hooks.mailinglist = "" + config multimailhook.mailinglist = "" [% ELSE -%] [% IF r.repos.$repo.mailinglist -%] - config hooks.mailinglist = "[% r.repos.$repo.mailinglist %]" + config multimailhook.mailinglist = "[% r.repos.$repo.mailinglist %]" [% ELSE -%] - config hooks.mailinglist = "<%= @ml %>-commits@ml.mageia.org" + config multimailhook.mailinglist = "<%= @ml %>-commits@ml.mageia.org" [% END -%] [% END -%] - config hooks.emailprefix = "[[% repo %]] " - config hooks.envelopesender = "root@mageia.org" - config hooks.showrev = "/usr/local/bin/mgagit-format-commit-email %s" + config multimailhook.emailDomain = "mageia.org" + config multimailhook.envelopeSender = "root@mageia.org" config gitweb.description = "[% r.repos.$repo.description %]" [% IF r.users.$maintainer -%] config gitweb.owner = "[% r.users.$maintainer.cn.0 %] [[% maintainer %]]" diff --git a/deployment/mgagit/templates/repodef_repo.gl b/deployment/mgagit/templates/repodef_repo.gl index 883ded33..10a5acfa 100644 --- a/deployment/mgagit/templates/repodef_repo.gl +++ b/deployment/mgagit/templates/repodef_repo.gl @@ -2,8 +2,7 @@ repo [% repo %] RW master$ = [% r.repos.$repo.maintainer %] RW+ user/USER/ = @all R = @all - config hooks.mailinglist = "sysadmin-commits@ml.mageia.org" - config hooks.emailprefix = "[[% repo %]] " - config hooks.envelopesender = "root@mageia.org" - config hooks.showrev = "/usr/local/bin/mgagit-format-commit-email %s" + config multimailhook.mailinglist = "sysadmin-commits@ml.mageia.org" + config multimailhook.emailDomain = "mageia.org" + config multimailhook.envelopeSender = "root@mageia.org" config gitweb.description = "[% r.repos.$repo.description %]" |