Merge remote-tracking branch 'origin/develop'0.2.2

Conflicts:
	provider_base/services/webapp.json

1 files changed, 26 insertions, 0 deletions

diff --git a/puppet/modules/site_haproxy/manifests/init.pp b/puppet/modules/site_haproxy/manifests/init.pp
new file mode 100644
index 00000000..ace88a7b
--- /dev/null
+++ b/puppet/modules/site_haproxy/manifests/init.pp
@@ -0,0 +1,26 @@
+class site_haproxy {
+
+    class { 'haproxy':
+    enable           => true,
+    version          => '1.4.23-0.1~leap60+1',
+    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'
+    }
+  }
+
+}