44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From 4485b6cbf5a8bf1d3830b0406685aba3ece4e413 Mon Sep 17 00:00:00 2001
|
|
From: Don Penney <don.penney@windriver.com>
|
|
Date: Wed, 11 Jan 2017 13:05:12 -0500
|
|
Subject: [PATCH] Roll up TIS patches
|
|
|
|
---
|
|
manifests/config.pp | 4 ++--
|
|
manifests/init.pp | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/manifests/config.pp b/manifests/config.pp
|
|
index 781b6fa..785740d 100644
|
|
--- a/manifests/config.pp
|
|
+++ b/manifests/config.pp
|
|
@@ -68,8 +68,8 @@ define haproxy::config (
|
|
if $_global_options['chroot'] {
|
|
file { $_global_options['chroot']:
|
|
ensure => directory,
|
|
- owner => $_global_options['user'],
|
|
- group => $_global_options['group'],
|
|
+ owner => 'root',
|
|
+ group => 'root',
|
|
}
|
|
}
|
|
}
|
|
diff --git a/manifests/init.pp b/manifests/init.pp
|
|
index e2d3d92..b0369f7 100644
|
|
--- a/manifests/init.pp
|
|
+++ b/manifests/init.pp
|
|
@@ -101,8 +101,8 @@
|
|
class haproxy (
|
|
$package_ensure = 'present',
|
|
$package_name = $haproxy::params::package_name,
|
|
- $service_ensure = 'running',
|
|
- $service_manage = true,
|
|
+ $service_ensure = false,
|
|
+ $service_manage = false,
|
|
$service_options = $haproxy::params::service_options,
|
|
$sysconfig_options = $haproxy::params::sysconfig_options,
|
|
$global_options = $haproxy::params::global_options,
|
|
--
|
|
1.8.3.1
|
|
|