#!/bin/sh
-# ensure we use a current perl
-export PATH=/home/nm4/perl5/perlbrew/bin:/home/nm4/bin:$PATH
-
-# git/bugzilla integration
-flock $0 /home/nm4/src/git-perl-utils/script/git-to-bugzilla.pl --config=/home/nm4/src/git-perl-utils/exim.yml
-flock $0 /home/nm4/src/git-perl-utils/script/git-to-bugzilla.pl --config=/home/nm4/src/git-perl-utils/exim-website.yml
-
-#cd /home/dwmw2/git/linux-2.6
-#git pull
-#gitfeedmaillist.sh
-
-export FROM="Exim Git Commits Mailing List <exim-git@exim.org>"
-export SENDMAIL=/usr/sbin/exim
-##export MLIST=nigel.metheringham@dev.intechnology.co.uk
+export PATH=/home/nm4/bin:$PATH
+#
+# merge exim.org/github repos
+#
export GIT_DIR=/home/git/exim.git
export GIT_KEY=/home/nm4/.ssh/git_repo_sync
export GIT_SSH=/home/nm4/bin/gitssh.sh
git fetch --quiet github
git push --all github 2>&1 | fgrep -v 'Everything up-to-date'
git push --tags github 2>&1 | fgrep -v 'Everything up-to-date'
+
+#
+# base config for mailing
+#
+export FROM="Exim Git Commits Mailing List <exim-cvs@exim.org>"
+export SENDMAIL=/usr/sbin/exim
+
+#
+# Mail out updates for exim git
+#
export MAILTAG=/home/nm4/.git-mail-exim
export MLIST=exim-cvs@exim.org
-export GITWEB=http://git.exim.org/exim.git
+export GITWEB=https://git.exim.org/exim.git
flock $0 /home/services/misc-git-hacks/git-feed-mail-list.sh
+#
+# Mail out updates for exim website git
+#
export GIT_DIR=/home/git/exim-website.git
export MAILTAG=/home/nm4/.git-mail-exim-website
export MLIST=exim-cvs@exim.org
-export GITWEB=http://git.exim.org/exim-website.git
+export GITWEB=https://git.exim.org/exim-website.git
flock $0 /home/services/misc-git-hacks/git-feed-mail-list.sh
+
+# end