From d0fea1ebf8c3857b40bee5507a4f6b44149df526 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 21 Aug 2013 19:55:36 +0000 Subject: mgagit: Attempt to envelope the emails so they make it to the commits mailing lists --- deployment/mgagit/templates/gitolite.rc | 2 +- deployment/mgagit/templates/group_owned_repo.gl | 1 + deployment/mgagit/templates/repodef_repo.gl | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'deployment/mgagit') 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 %] -- cgit v1.2.1