Enable CIA's commit notifications

We now use CIA's service to send commit notifications to IRC.  They are
currently sent to the #Nagios-Devel channel on Freenode.  See:

	http://cia.vc/stats/project/nagiosplug/
	http://cia.vc/account/bots/15699/

diff --git a/tools/git-notify b/tools/git-notify
index faa1785053bf735a90cf713da3b1992b5ca393ab..d8528234cd0a64d7c490168cfacc5ed2cbb0ffe3 100755 (executable)
--- a/tools/git-notify
+++ b/tools/git-notify
@@ -48,7 +48,7 @@ sub get_repos_name();
 my $mailer = "/usr/bin/mail";
 
 # CIA notification address
-my $cia_address = "cia\@cia.navi.cx";
+my $cia_address = "cia\@cia.vc";
 
 # debug mode
 my $debug = 0;
@@ -327,7 +327,7 @@ sub mail_notification($$$@)
 {
     my ($name, $subject, $content_type, @text) = @_;
 
-    $subject = "[$repos_name] $subject" if $emit_repo;
+    $subject = "[$repos_name] $subject" if ($emit_repo and $name ne $cia_address);
     $subject = encode("MIME-Q",$subject);
 
     if ($debug)

diff --git a/tools/git-post-receive-hook b/tools/git-post-receive-hook
index 70d259e7bcc9fa0ec32de9394d7b1915afbfe9d5..fd1f8697e13cb9eacaea9dd16b7efdd0761604f6 100755 (executable)
--- a/tools/git-post-receive-hook
+++ b/tools/git-post-receive-hook
@@ -4,11 +4,13 @@ prefix="${0%/*}/notifications"        # $GIT_DIR/hooks/notifications
 recipient='Nagios Plugin Commits <nagiosplug-checkins@lists.sourceforge.net>'
 maxcommits=100
 maxdiffsize=$((300 * 1024))
+project='nagiosplug'
 gitweburl='http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug'
 gitnotify="$prefix/git-notify.pl"
 statefile="$prefix/git-notify.dat"
 
 exec "$gitnotify" \
+  -c "$project" \
   -m "$recipient" \
   -n "$maxcommits" \
   -s "$maxdiffsize" \