aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/mgagit
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-10-07 11:07:44 +0000
committerColin Guthrie <colin@mageia.org>2013-10-07 11:07:44 +0000
commit43208239383db426febfc7ce519fd5667cb56b70 (patch)
tree37571db642c5b8c722fffcb17d847df96058d0b2 /deployment/mgagit
parent264ceb41d6774b3f9338e50bc7e972d18121fa99 (diff)
downloadpuppet-43208239383db426febfc7ce519fd5667cb56b70.tar
puppet-43208239383db426febfc7ce519fd5667cb56b70.tar.gz
puppet-43208239383db426febfc7ce519fd5667cb56b70.tar.bz2
puppet-43208239383db426febfc7ce519fd5667cb56b70.tar.xz
puppet-43208239383db426febfc7ce519fd5667cb56b70.zip
mgagit: Remove old emailer
Diffstat (limited to 'deployment/mgagit')
-rw-r--r--deployment/mgagit/manifests/init.pp4
-rw-r--r--deployment/mgagit/templates/format-commit-email.sh19
-rw-r--r--deployment/mgagit/templates/gitolite.rc2
3 files changed, 1 insertions, 24 deletions
diff --git a/deployment/mgagit/manifests/init.pp b/deployment/mgagit/manifests/init.pp
index 2df95c42..c55b7f9e 100644
--- a/deployment/mgagit/manifests/init.pp
+++ b/deployment/mgagit/manifests/init.pp
@@ -43,10 +43,6 @@ class mgagit(
require => Package['mgagit'],
}
- mga_common::local_script { 'mgagit-format-commit-email':
- content => template('mgagit/format-commit-email.sh'),
- }
-
file { "$gitolite_commonhooksdir/git_multimail.py":
ensure => present,
owner => $git_login,
diff --git a/deployment/mgagit/templates/format-commit-email.sh b/deployment/mgagit/templates/format-commit-email.sh
deleted file mode 100644
index f41c3fce..00000000
--- a/deployment/mgagit/templates/format-commit-email.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-REV=$1
-if [ -z "$1" ]; then
- echo "Unknown Commit"
- exit
-fi
-if [ -z "$GL_REPO" ]; then
- echo "Cannot find Gitolite Repository"
- exit
-fi
-
-echo '-----------------------------------------------------------------------'
-echo
-echo "http://gitweb.mageia.org/$GL_REPO/commit/?id=$REV"
-echo
-echo
-git show -C $REV
-echo
diff --git a/deployment/mgagit/templates/gitolite.rc b/deployment/mgagit/templates/gitolite.rc
index 7afeda6b..e1a3d92d 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 multimailhook\.mailinglist multimailhook\.emailDomain multimailhook\.envelopeSender',
+ GIT_CONFIG_KEYS => 'gitweb\.description gitweb\.owner multimailhook\.mailinglist multimailhook\.emailDomain multimailhook\.envelopeSender',
# comment out if you don't need all the extra detail in the logfile
LOG_EXTRA => 1,