Merge branch 'develop'

Conflicts:
	platform.rb

Change-Id: Ic2e08e594d29a585691341c8667ac0b64933a505

1 files changed, 21 insertions, 21 deletions

diff --git a/puppet/modules/site_haproxy/manifests/init.pp b/puppet/modules/site_haproxy/manifests/init.pp
index 6bcf3f5c..b28ce80e 100644
--- a/puppet/modules/site_haproxy/manifests/init.pp
+++ b/puppet/modules/site_haproxy/manifests/init.pp
@@ -2,25 +2,25 @@ class site_haproxy {
     $haproxy     = hiera('haproxy')
 
     class { 'haproxy':
-    enable           => true,
-    manage_service   => true,
-    global_options   => {
-      'log'     => '127.0.0.1 local0',
-      'maxconn' => '4096',
-      'stats'   => 'socket /var/run/haproxy.sock user haproxy group haproxy',
-      'chroot'  => '/usr/share/haproxy',
-      'user'    => 'haproxy',
-      'group'   => 'haproxy',
-      'daemon'  => ''
-    },
-    defaults_options => {
-      'log'             => 'global',
-      'retries'         => '3',
-      'option'          => 'redispatch',
-      'timeout connect' => '4000',
-      'timeout client'  => '20000',
-      'timeout server'  => '20000'
-    }
+      enable           => true,
+      manage_service   => true,
+      global_options   => {
+        'log'     => '127.0.0.1 local0',
+        'maxconn' => '4096',
+        'stats'   => 'socket /var/run/haproxy.sock user haproxy group haproxy',
+        'chroot'  => '/usr/share/haproxy',
+        'user'    => 'haproxy',
+        'group'   => 'haproxy',
+        'daemon'  => ''
+      },
+      defaults_options => {
+        'log'             => 'global',
+        'retries'         => '3',
+        'option'          => 'redispatch',
+        'timeout connect' => '4000',
+        'timeout client'  => '20000',
+        'timeout server'  => '20000'
+      }
   }
 
   # monitor haproxy
@@ -34,8 +34,8 @@ class site_haproxy {
   concat::fragment { 'leap_haproxy_webapp_couchdb':
     target  => '/etc/haproxy/haproxy.cfg',
     order   => '20',
-    content => template('site_haproxy/haproxy_couchdb.cfg.erb'),
+    content => template('site_haproxy/haproxy.cfg.erb'),
   }
-  
+
   include site_check_mk::agent::haproxy
 }