From 2be0854283b43717012d807e18cd0cc340b32a8b Mon Sep 17 00:00:00 2001
From: Ciaby <ciaby@rhizomatica.org>
Date: Tue, 15 Jul 2014 14:59:42 -0500
Subject: [PATCH] Kannel fixes.

---
 modules/kannel/manifests/init.pp         | 5 -----
 modules/kannel/templates/kannel.conf.erb | 9 +++++++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/kannel/manifests/init.pp b/modules/kannel/manifests/init.pp
index 6d3b876..161d03f 100644
--- a/modules/kannel/manifests/init.pp
+++ b/modules/kannel/manifests/init.pp
@@ -31,9 +31,4 @@ class kannel (
       notify  => Service['kannel'],
   }
 
-  service { 'kannel':
-      ensure  => running,
-      enable  => true,
-      require => Package['kannel'],
-  }
 }
diff --git a/modules/kannel/templates/kannel.conf.erb b/modules/kannel/templates/kannel.conf.erb
index cf9d72c..ae0bfb2 100644
--- a/modules/kannel/templates/kannel.conf.erb
+++ b/modules/kannel/templates/kannel.conf.erb
@@ -10,6 +10,7 @@ smsbox-port = 14001
 #box-allow-ip = "127.0.0.1"
 #sms-resend-retry = 2
 
+
 # SMSC SMPP
 group = smsc
 smsc = smpp
@@ -20,18 +21,20 @@ port = 2775
 interface-version=34
 alt-charset = ISO-8859-1
 enquire-link-interval = 10
-connection-timeout = 10
-reconnect-delay = 10
 connect-allow-ip = 127.0.0.1
 transceiver-mode = true
 smsc-username = OSMPP
 smsc-password = <%= @smsc_password %>
 system-type = kannel
+connection-timeout = 10
+reconnect-delay = 10
+
 
 group = smsbox-route
 smsbox-id = mysm
 smsc-id = KSMPP
 
+
 # receive SMS
 group = sms-service
 #keyword =
@@ -40,6 +43,7 @@ catch-all = yes
 max-messages = 0
 post-url = "http://localhost:8085/sms?source=%p&destination=%P&charset=%C&coding=%c&text=%a"
 
+
 # send to web cgi
 group = sendsms-user
 default-smsc = KSMPP
@@ -48,6 +52,7 @@ password = <%= @kannel_sendsms_password %>
 concatenation = true
 max-messages = 3
 
+
 # SMSBOX SETUP
 group = smsbox
 #smsbox-port = 14001