Merge lp:~lars.duesing/ubuntu/quantal/aiccu/aiccu-1007408 into lp:ubuntu/quantal/aiccu

[Lars Düsing]

Fixed Bug LP: #1007408
getting default server tic.sixxs.net honoured by upstart-script.
Test-Case: comment out the "server tic.sixxs.net"-line in /etc/aiccu.conf

[James Page (james-page)]

Hi Lars

LGTM - uploaded.

review: Approve

=== modified file 'debian/aiccu.upstart'
--- debian/aiccu.upstart	2012-04-02 11:40:44 +0000
+++ debian/aiccu.upstart	2012-06-15 10:23:18 +0000
@@ -65,8 +65,8 @@
     # Workaround race with local DNS services
     server=$(grep "^server" /etc/aiccu.conf | awk '{ print $2 }')
     if [ -z "$server" ]; then
-        log "No server configuration specified"
-        exit 1
+        log "No server configuration specified - defaulting to tic.sixxs.net"
+	server="tic.sixxs.net"
     fi
     log "Checking access to $server: "
     count=0

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-10 10:34:01 +0000
+++ debian/changelog	2012-06-15 10:23:18 +0000
@@ -1,3 +1,10 @@
+aiccu (20070115-15ubuntu3) quantal; urgency=low
+
+  * upstart-script did not honour default server tic.sixxs.net 
+    (LP: #1007408)
+
+ -- Lars Duesing <[e-mail]>  Fri, 15 Jun 2012 11:58:43 +0200
+
 aiccu (20070115-15ubuntu2) quantal; urgency=low
 
   * Add apport hook for /var/log/aiccu.log (LP: #1001432)