Merge "Update git.o.o configs for better rolling reboots"

modules/cgit/manifests/init.pp

@@ -34,7 +34,6 @@ class cgit(
       'cgit',
       'git-daemon',
       'highlight',
-      'socat',
     ]:
     ensure => present,
   }
@@ -171,6 +170,7 @@ class cgit(
 
   service { 'git-daemon':
     ensure    => running,
+    enable    => true,
     subscribe => File['/etc/init.d/git-daemon'],
   }
 

modules/openstack_project/manifests/git.pp

@@ -29,6 +29,10 @@ class openstack_project::git (
     mode => 'enforcing'
   }
 
+  package { 'socat':
+    ensure => present,
+  }
+
   class { 'haproxy':
     enable         => true,
     global_options => {
@@ -39,7 +43,7 @@ class openstack_project::git (
       'user'    => 'haproxy',
       'group'   => 'haproxy',
       'daemon'  => '',
-      'stats'   => 'socket /var/lib/haproxy/stats'
+      'stats'   => 'socket /var/lib/haproxy/stats user root group root mode 0600 level admin'
     },
   }
   # The three listen defines here are what the world will hit.