diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-08-21 19:55:36 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-08-21 19:55:36 +0000 |
| commit | d0fea1ebf8c3857b40bee5507a4f6b44149df526 (patch) | |
| tree | 3dd6bf7ee05e21664933d1b155f199ce4b169ea9 /deployment/mgagit | |
| parent | b34f80f486f9cc33fd47aaa7e417d41f47308385 (diff) | |
| download | puppet-d0fea1ebf8c3857b40bee5507a4f6b44149df526.tar puppet-d0fea1ebf8c3857b40bee5507a4f6b44149df526.tar.gz puppet-d0fea1ebf8c3857b40bee5507a4f6b44149df526.tar.bz2 puppet-d0fea1ebf8c3857b40bee5507a4f6b44149df526.tar.xz puppet-d0fea1ebf8c3857b40bee5507a4f6b44149df526.zip | |
mgagit: Attempt to envelope the emails so they make it to the commits mailing lists
Diffstat (limited to 'deployment/mgagit')
| -rw-r--r-- | deployment/mgagit/templates/gitolite.rc | 2 | ||||
| -rw-r--r-- | deployment/mgagit/templates/group_owned_repo.gl | 1 | ||||
| -rw-r--r-- | deployment/mgagit/templates/repodef_repo.gl | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/deployment/mgagit/templates/gitolite.rc b/deployment/mgagit/templates/gitolite.rc index f4f671d2..171b6662 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\.noemail', + GIT_CONFIG_KEYS => 'gitweb\.description gitweb\.owner hooks\.mailinglist hooks\.emailprefix hooks\.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 9187757d..151fc140 100644 --- a/deployment/mgagit/templates/group_owned_repo.gl +++ b/deployment/mgagit/templates/group_owned_repo.gl @@ -22,6 +22,7 @@ repo [% repo %] [% END -%] [% END -%] config hooks.emailprefix = "[% repo %] " + config hooks.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 399abda5..08f58d3d 100644 --- a/deployment/mgagit/templates/repodef_repo.gl +++ b/deployment/mgagit/templates/repodef_repo.gl @@ -4,4 +4,5 @@ repo [% repo %] R = @all config hooks.mailinglist = sysadmin-commits@ml.mageia.org config hooks.emailprefix = [% repo %] + config hooks.envelopesender = "root@mageia.org" config gitweb.description = [% r.repos.$repo.description %] |