blob: fba9ca2f0d138dbf1bc64ee32b30e05e963a689a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
|
diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppet.conf puppet-0.24.1/conf/gentoo/puppet/puppet.conf
--- puppet-0.24.1.orig/conf/gentoo/puppet/puppet.conf 1970-01-01 09:00:00.000000000 +0900
+++ puppet-0.24.1/conf/gentoo/puppet/puppet.conf 2008-01-07 23:24:05.000000000 +0900
@@ -0,0 +1,29 @@
+[main]
+ # Where Puppet stores dynamic and growing data.
+ # The default value is '/var/puppet'.
+ vardir = /var/lib/puppet
+
+ # The Puppet log directory.
+ # The default value is '$vardir/log'.
+ logdir = /var/log/puppet
+
+ # Where Puppet PID files are kept.
+ # The default value is '$vardir/run'.
+ rundir = /var/run/puppet
+
+ # Where SSL certificates are kept.
+ # The default value is '$confdir/ssl'.
+ ssldir = $vardir/ssl
+
+[puppetd]
+ # The file in which puppetd stores a list of the classes
+ # associated with the retrieved configuratiion. Can be loaded in
+ # the separate ``puppet`` executable using the ``--loadclasses``
+ # option.
+ # The default value is '$confdir/classes.txt'.
+ classfile = $vardir/classes.txt
+
+ # Where puppetd caches the local configuration. An
+ # extension indicating the cache format is added automatically.
+ # The default value is '$confdir/localconfig'.
+ localconfig = $vardir/localconfig
diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppetca.conf puppet-0.24.1/conf/gentoo/puppet/puppetca.conf
--- puppet-0.24.1.orig/conf/gentoo/puppet/puppetca.conf 2007-11-01 04:44:27.000000000 +0900
+++ puppet-0.24.1/conf/gentoo/puppet/puppetca.conf 1970-01-01 09:00:00.000000000 +0900
@@ -1,29 +0,0 @@
-[puppet]
- # Where Puppet stores dynamic and growing data.
- # The default value is '/var/puppet'.
- vardir = /var/lib/puppet
-
- # The Puppet log directory.
- # The default value is '$vardir/log'.
- logdir = /var/log/puppet
-
- # Where Puppet PID files are kept.
- # The default value is '$vardir/run'.
- rundir = /var/run/puppet
-
- # Where SSL certificates are kept.
- # The default value is '$confdir/ssl'.
- ssldir = $vardir/ssl
-
-[puppetd]
- # The file in which puppetd stores a list of the classes
- # associated with the retrieved configuratiion. Can be loaded in
- # the separate ``puppet`` executable using the ``--loadclasses``
- # option.
- # The default value is '$confdir/classes.txt'.
- classfile = $vardir/classes.txt
-
- # Where puppetd caches the local configuration. An
- # extension indicating the cache format is added automatically.
- # The default value is '$confdir/localconfig'.
- localconfig = $vardir/localconfig
diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppetd.conf puppet-0.24.1/conf/gentoo/puppet/puppetd.conf
--- puppet-0.24.1.orig/conf/gentoo/puppet/puppetd.conf 2007-11-01 04:44:27.000000000 +0900
+++ puppet-0.24.1/conf/gentoo/puppet/puppetd.conf 1970-01-01 09:00:00.000000000 +0900
@@ -1,29 +0,0 @@
-[puppet]
- # Where Puppet stores dynamic and growing data.
- # The default value is '/var/puppet'.
- vardir = /var/lib/puppet
-
- # The Puppet log directory.
- # The default value is '$vardir/log'.
- logdir = /var/log/puppet
-
- # Where Puppet PID files are kept.
- # The default value is '$vardir/run'.
- rundir = /var/run/puppet
-
- # Where SSL certificates are kept.
- # The default value is '$confdir/ssl'.
- ssldir = $vardir/ssl
-
-[puppetd]
- # The file in which puppetd stores a list of the classes
- # associated with the retrieved configuratiion. Can be loaded in
- # the separate ``puppet`` executable using the ``--loadclasses``
- # option.
- # The default value is '$confdir/classes.txt'.
- classfile = $vardir/classes.txt
-
- # Where puppetd caches the local configuration. An
- # extension indicating the cache format is added automatically.
- # The default value is '$confdir/localconfig'.
- localconfig = $vardir/localconfig
diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppetmasterd.conf puppet-0.24.1/conf/gentoo/puppet/puppetmasterd.conf
--- puppet-0.24.1.orig/conf/gentoo/puppet/puppetmasterd.conf 2007-11-01 04:44:27.000000000 +0900
+++ puppet-0.24.1/conf/gentoo/puppet/puppetmasterd.conf 1970-01-01 09:00:00.000000000 +0900
@@ -1,29 +0,0 @@
-[puppet]
- # Where Puppet stores dynamic and growing data.
- # The default value is '/var/puppet'.
- vardir = /var/lib/puppet
-
- # The Puppet log directory.
- # The default value is '$vardir/log'.
- logdir = /var/log/puppet
-
- # Where Puppet PID files are kept.
- # The default value is '$vardir/run'.
- rundir = /var/run/puppet
-
- # Where SSL certificates are kept.
- # The default value is '$confdir/ssl'.
- ssldir = $vardir/ssl
-
-[puppetd]
- # The file in which puppetd stores a list of the classes
- # associated with the retrieved configuratiion. Can be loaded in
- # the separate ``puppet`` executable using the ``--loadclasses``
- # option.
- # The default value is '$confdir/classes.txt'.
- classfile = $vardir/classes.txt
-
- # Where puppetd caches the local configuration. An
- # extension indicating the cache format is added automatically.
- # The default value is '$confdir/localconfig'.
- localconfig = $vardir/localconfig
diff -Naur puppet-0.24.1.orig/lib/puppet/provider/service/gentoo.rb puppet-0.24.1/lib/puppet/provider/service/gentoo.rb
--- puppet-0.24.1.orig/lib/puppet/provider/service/gentoo.rb 2007-11-01 04:44:27.000000000 +0900
+++ puppet-0.24.1/lib/puppet/provider/service/gentoo.rb 2008-01-07 23:24:10.000000000 +0900
@@ -29,7 +29,7 @@
return :false unless line
# If it's enabled then it will print output showing service | runlevel
- if output =~ /#{@resource[:name]}\s*|\s*default/
+ if output =~ /#{@resource[:name]}\s*\|\s*default/
return :true
else
return :false
|
GitWeb