diff options
| author | Holger Levsen <holger@layer-acht.org> | 2012-11-20 00:51:36 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2012-11-20 00:51:36 +0100 |
| commit | e8f6f4aa2ed431d5cc85192a8dc0832b45337bd4 (patch) | |
| tree | 78d8d9a6bbd223220175520c20b9c194ca9df2a9 | |
| parent | 0dfb874f39279e3efeb6cc076f51cfd8b2781c35 (diff) | |
| download | jenkins.debian.net-e8f6f4aa2ed431d5cc85192a8dc0832b45337bd4.tar.xz | |
fix email2irc stuff
| -rw-r--r-- | TODO | 1 | ||||
| -rwxr-xr-x | bin/email2irc.sh | 4 | ||||
| -rw-r--r-- | etc/postfix/main.cf | 2 | ||||
| -rwxr-xr-x | update_jdn.sh | 2 |
4 files changed, 5 insertions, 4 deletions
@@ -26,6 +26,7 @@ See link:http://jenkins.debian.net/userContent/about.html["about jenkins.debian. * update jdk * fully automate backup and full backup /var/lib/jenkins/jobs and /var/lib/munin and /var/log too * try awstats +* put kgb-client.conf in git and sed passwords from filesystem into it... === Bugs diff --git a/bin/email2irc.sh b/bin/email2irc.sh index 60382a3c..83c4edfc 100755 --- a/bin/email2irc.sh +++ b/bin/email2irc.sh @@ -22,7 +22,6 @@ while read line ; do echo $line >> /var/lib/jenkins/email_log CHANNEL=$(echo $line | cut -d "+" -f2| cut -d "@" -f1) echo "CHANNEL = $CHANNEL" >> /var/lib/jenkins/email_log - echo >> /var/lib/jenkins/email_log fi if [[ $line =~ ^(X-Jenkins-Job: .*) ]] ; then JENKINS_JOB=${line:15} @@ -45,7 +44,8 @@ if [ "$VALID_MAIL" == "true" ] ; then echo $FIRST_LINE >> /var/lib/jenkins/email_log if [ ! -z $CHANNEL ] ; then echo "#$CHANNEL: $SUBJECT. $FIRST_LINE" >> /var/lib/jenkins/email_log - kgb-client --conf /srv/jenkins/kgb/$CHANNEL.conf --relay-msg "$SUBJECT. $FIRST_LINE" + kgb-client --conf /srv/jenkins/kgb/$CHANNEL.conf --relay-msg "$SUBJECT. $FIRST_LINE" && echo "kgb informed successfully." >> /var/lib/jenkins/email_log + echo >> /var/lib/jenkins/email_log else echo "But no irc channel detected." >> /var/lib/jenkins/email_log fi diff --git a/etc/postfix/main.cf b/etc/postfix/main.cf index 142c1b9a..c83b982e 100644 --- a/etc/postfix/main.cf +++ b/etc/postfix/main.cf @@ -37,4 +37,4 @@ mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mailbox_size_limit = 0 recipient_delimiter = + inet_interfaces = all -mailbox_command = /usr/bin/procmail -a "$EXTENSION" DEFAULT=$HOME/Maildir/ MAILDIR=$HOME/Maildir +mailbox_command = /usr/bin/procmail -a "$EXTENSION" diff --git a/update_jdn.sh b/update_jdn.sh index 3216246e..3250621a 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -25,7 +25,7 @@ done # sudo apt-get install vim screen less etckeeper moreutils curl mtr-tiny dstat devscripts bash-completion shorewall shorewall6 cron-apt apt-listchanges munin calamaris visitors \ build-essential python-setuptools \ - debootstrap sudo figlet graphviz apache2 python-yaml python-pip mr subversion subversion-tools vnstat webcheck procmail + debootstrap sudo figlet graphviz apache2 python-yaml python-pip mr subversion subversion-tools vnstat webcheck procmail libjson-rpc-perl explain "Packages installed." # |