parent
8ebb464e36
commit
9320d61fcf
@ -0,0 +1,45 @@
|
|||||||
|
From 9deed392392c229fd8f20fe5e52a4853f8363484 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Haikel Guemar <hguemar@fedoraproject.org>
|
||||||
|
Date: Thu, 9 Apr 2015 01:38:19 +0200
|
||||||
|
Subject: [PATCH 1/2] Fix puppet paths
|
||||||
|
|
||||||
|
---
|
||||||
|
lib/puppet/util/run_mode.rb | 10 +++++-----
|
||||||
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb
|
||||||
|
index 07e33a6..82b4558 100644
|
||||||
|
--- a/lib/puppet/util/run_mode.rb
|
||||||
|
+++ b/lib/puppet/util/run_mode.rb
|
||||||
|
@@ -55,23 +55,23 @@ module Puppet
|
||||||
|
|
||||||
|
class UnixRunMode < RunMode
|
||||||
|
def conf_dir
|
||||||
|
- which_dir("/etc/puppetlabs/puppet", "~/.puppet")
|
||||||
|
+ which_dir("/etc/puppet", "~/.puppet")
|
||||||
|
end
|
||||||
|
|
||||||
|
def code_dir
|
||||||
|
- which_dir("/etc/puppetlabs/code", "~/.puppet/code")
|
||||||
|
+ which_dir("/etc/puppet", "~/.puppet/code")
|
||||||
|
end
|
||||||
|
|
||||||
|
def var_dir
|
||||||
|
- which_dir("/opt/puppetlabs/puppet/cache", "~/.puppet/var")
|
||||||
|
+ which_dir("/var/lib/puppet/cache", "~/.puppet/var")
|
||||||
|
end
|
||||||
|
|
||||||
|
def run_dir
|
||||||
|
- which_dir("/var/run/puppetlabs", "~/.puppet/var/run")
|
||||||
|
+ which_dir("/var/run/puppet", "~/.puppet/var/run")
|
||||||
|
end
|
||||||
|
|
||||||
|
def log_dir
|
||||||
|
- which_dir("/var/log/puppetlabs", "~/.puppet/var/log")
|
||||||
|
+ which_dir("/var/log/puppet", "~/.puppet/var/log")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
--
|
||||||
|
2.3.5
|
||||||
|
|
@ -0,0 +1,25 @@
|
|||||||
|
From df2058dde597baf6e1534a05dde879f0a7738fdf Mon Sep 17 00:00:00 2001
|
||||||
|
From: Haikel Guemar <hguemar@fedoraproject.org>
|
||||||
|
Date: Mon, 13 Apr 2015 14:25:11 +0200
|
||||||
|
Subject: [PATCH 2/2] make systemd the default init for fedora in puppet
|
||||||
|
|
||||||
|
---
|
||||||
|
lib/puppet/provider/service/systemd.rb | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/lib/puppet/provider/service/systemd.rb b/lib/puppet/provider/service/systemd.rb
|
||||||
|
index 39ef5ea..89b6b62 100644
|
||||||
|
--- a/lib/puppet/provider/service/systemd.rb
|
||||||
|
+++ b/lib/puppet/provider/service/systemd.rb
|
||||||
|
@@ -7,7 +7,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
|
||||||
|
|
||||||
|
defaultfor :osfamily => [:archlinux]
|
||||||
|
defaultfor :osfamily => :redhat, :operatingsystemmajrelease => "7"
|
||||||
|
- defaultfor :osfamily => :redhat, :operatingsystem => :fedora, :operatingsystemmajrelease => ["17", "18", "19", "20", "21"]
|
||||||
|
+ defaultfor :osfamily => :redhat, :operatingsystem => :fedora
|
||||||
|
defaultfor :osfamily => :suse, :operatingsystemmajrelease => ["12", "13"]
|
||||||
|
|
||||||
|
def self.instances
|
||||||
|
--
|
||||||
|
2.3.5
|
||||||
|
|
Loading…
Reference in new issue