Skip to content

Commit ee97e64

Browse files
committed
Replace none US-ASCII chars which can lead to encoding issues with puppet server
1 parent 4f07c03 commit ee97e64

26 files changed

+75
-73
lines changed

README.md

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,15 @@ It is not intended to be used directly by external resources like node definitio
129129

130130
#### Client - Class ::bareos::client::client
131131

132-
The Client Resource (or FileDaemon) resource defines the name of the Client (as used by the Director) as well as the port on which the Client listens for Director connections.
132+
The Client Resource (or FileDaemon) resource defines the name of the Client (as used by the Director) as well as the port on which the Client listens for Director connections.
133133

134134
#### Director - Define ::bareos::client::director
135135

136-
The Director resource defines the name and password of the Directors that are permitted to contact this Client.
136+
The Director resource defines the name and password of the Directors that are permitted to contact this Client.
137137

138138
#### Messages - Define ::bareos::client::messages
139139

140-
The Messages resource defines how messages are to be handled and destinations to which they should be sent.
140+
The Messages resource defines how messages are to be handled and destinations to which they should be sent.
141141

142142
### Console
143143
`Class ::bareos::console`
@@ -156,8 +156,8 @@ If someone has more information, feel free to add this info ;-).
156156

157157
#### Director - Define ::bareos::console::director
158158

159-
The Director resource defines the attributes of the Director running on the network.
160-
You may have multiple Director resource specifications in a single Console configuration file.
159+
The Director resource defines the attributes of the Director running on the network.
160+
You may have multiple Director resource specifications in a single Console configuration file.
161161
If you have more than one, you will be prompted to choose one when you start the Console program.
162162

163163
```puppet
@@ -179,19 +179,19 @@ It is not intended to be used directly by external resources like node definitio
179179

180180
#### Director - Class ::bareos::director::director
181181

182-
To define the Directors name and its access password used for authenticating the Console program.
183-
Only a single Director resource definition may appear in the Director’s configuration file.
182+
To define the Director's name and its access password used for authenticating the Console program.
183+
Only a single Director resource definition may appear in the Director's configuration file.
184184

185185
#### Catalog - Define ::bareos::director::catalog
186186

187-
To define in what database to keep the list of files and the Volume names where they are backed up.
187+
To define in what database to keep the list of files and the Volume names where they are backed up.
188188
Most people only use a single catalog.
189189
It is possible, however not adviced and not supported to use multiple catalogs.
190190

191191
#### Client - Define ::bareos::director::client
192192

193-
To define what Client is to be backed up.
194-
You will generally have multiple Client definitions.
193+
To define what Client is to be backed up.
194+
You will generally have multiple Client definitions.
195195
Each Job will reference only a single client.
196196

197197
#### Console - Define ::bareos::director::console
@@ -201,11 +201,11 @@ Both the names and the passwords in these two entries must match much as is the
201201

202202
#### Counter - Define ::bareos::director::counter
203203

204-
The Counter Resource defines a counter variable that can be accessed by variable expansion used for creating Volume labels with the Label Format Dir Pool directive.
204+
The Counter Resource defines a counter variable that can be accessed by variable expansion used for creating Volume labels with the Label Format Dir Pool directive.
205205

206206
#### FileSet - Define ::bareos::director::fileset
207207

208-
To define the set of files to be backed up for each Client.
208+
To define the set of files to be backed up for each Client.
209209
You may have any number of FileSets but each Job will reference only one.
210210

211211
FileSets do use `Include Exclude Items`, which are represented by hash. Hash values are only allowed to have other hashes, string values or array of string values.
@@ -226,8 +226,8 @@ FileSets do use `Include Exclude Items`, which are represented by hash. Hash val
226226
```
227227

228228
#### Job - Define ::bareos::director::job
229-
To define the backup/restore Jobs and to tie together the Client, FileSet and Schedule resources to be used for each Job.
230-
Normally, you will Jobs of different names corresponding to each client (i.e. one Job per client, but a different one with a different name for each client).
229+
To define the backup/restore Jobs and to tie together the Client, FileSet and Schedule resources to be used for each Job.
230+
Normally, you will Jobs of different names corresponding to each client (i.e. one Job per client, but a different one with a different name for each client).
231231

232232
Jobs does have `Run Script`, which is represented by hash. Hash values are only allowed to have other hashes, string values or array of string values (like the Include Exclude Items in Fileset).
233233

@@ -259,20 +259,20 @@ Almost the same like `Job`.
259259

260260
#### Messages - Define ::bareos::director::messages
261261

262-
To define where error and information messages are to be sent or logged.
263-
You may define multiple different message resources and hence direct particular classes of messages to different users or locations (files, ...).
262+
To define where error and information messages are to be sent or logged.
263+
You may define multiple different message resources and hence direct particular classes of messages to different users or locations (files, ...).
264264

265265
#### Pool - Define ::bareos::director::pool
266266

267-
To define the pool of Volumes that can be used for a particular Job.
267+
To define the pool of Volumes that can be used for a particular Job.
268268
Most people use a single default Pool.
269269
However, if you have a large number of clients or volumes, you may want to have multiple Pools.
270270
Pools allow you to restrict a Job (or a Client) to use only a particular set of Volumes.
271271

272272
#### Profile - Define ::bareos::director::profile
273273

274-
The Profile Resource defines a set of ACLs.
275-
Console Resources can be tight to one or more profiles, making it easier to use a common set of ACLs.
274+
The Profile Resource defines a set of ACLs.
275+
Console Resources can be tight to one or more profiles, making it easier to use a common set of ACLs.
276276

277277

278278
#### Schedule - Define ::bareos::director::schedule
@@ -284,8 +284,8 @@ In general, you specify an action to be taken and when.
284284

285285
#### Storage - Define ::bareos::director::storage
286286

287-
To define on what physical device the Volumes should be mounted.
288-
You may have one or more Storage definitions.
287+
To define on what physical device the Volumes should be mounted.
288+
You may have one or more Storage definitions.
289289

290290
### Monitor
291291
`Class ::bareos::monitor`
@@ -297,18 +297,18 @@ This class will be automatically included when a resource is defined.
297297
It is not intended to be used directly by external resources like node definitions or other modules.
298298

299299
#### Client - Define ::bareos::monitor::client
300-
The Client resource defines the attributes of the Clients that are monitored by this Monitor.
300+
The Client resource defines the attributes of the Clients that are monitored by this Monitor.
301301

302302
#### Director - Define ::bareos::monitor::director
303-
The Director resource defines the attributes of the Directors that are monitored by this Monitor.
303+
The Director resource defines the attributes of the Directors that are monitored by this Monitor.
304304

305305
#### Monitor - Define ::bareos::monitor::monitor
306-
The Monitor resource defines the attributes of the Monitor running on the network.
307-
The parameters you define here must be configured as a Director resource
308-
in Clients and Storages configuration files, and as a Console resource in Directors configuration files.
306+
The Monitor resource defines the attributes of the Monitor running on the network.
307+
The parameters you define here must be configured as a Director resource
308+
in Clients and Storages configuration files, and as a Console resource in Directors configuration files.
309309

310310
#### Storage - Define ::bareos::monitor::storage
311-
The Storage resource defines the attributes of the Storages that are monitored by this Monitor.
311+
The Storage resource defines the attributes of the Storages that are monitored by this Monitor.
312312

313313
### Storage
314314
`Class ::bareos::storage`
@@ -321,35 +321,35 @@ It is not intended to be used directly by external resources like node definitio
321321

322322
#### Storage - Class ::bareos::storage::storage
323323

324-
In general, the properties specified under the Storage resource define global properties of the Storage daemon.
324+
In general, the properties specified under the Storage resource define global properties of the Storage daemon.
325325

326326
#### Autochange - Define ::bareos::storage::autochanger
327327

328328
The Autochanger resource supports single or multiple drive autochangers
329329
by grouping one or more Device resources into one unit called an autochanger in Bareos
330-
(often referred to as a tape library by autochanger manufacturers).
330+
(often referred to as a "tape library" by autochanger manufacturers).
331331

332332
#### Device - Define ::bareos::storage::device
333333

334-
The Device Resource specifies the details of each device (normally a tape drive) that can be used by the Storage daemon.
334+
The Device Resource specifies the details of each device (normally a tape drive) that can be used by the Storage daemon.
335335
There may be multiple Device resources for a single Storage daemon.
336-
In general, the properties specified within the Device resource are specific to the Device.
336+
In general, the properties specified within the Device resource are specific to the Device.
337337

338338
#### Director - Define ::bareos::storage::director
339339

340-
The Director resource specifies the Name of the Director which is permitted to use the services of the Storage daemon.
340+
The Director resource specifies the Name of the Director which is permitted to use the services of the Storage daemon.
341341
There may be multiple Director resources.
342-
The Director Name and Password must match the corresponding values in the Director’s configuration file.
342+
The Director Name and Password must match the corresponding values in the Director's configuration file.
343343

344344
#### Messages - Define ::bareos::storage::messages
345345

346-
The Messages resource defines how messages are to be handled and destinations to which they should be sent.
346+
The Messages resource defines how messages are to be handled and destinations to which they should be sent.
347347

348348
#### NDMP - Define ::bareos::storage::ndmp
349349

350-
The NDMP Resource specifies the authentication details of each NDMP client.
350+
The NDMP Resource specifies the authentication details of each NDMP client.
351351
There may be multiple NDMP resources for a single Storage daemon.
352-
In general, the properties specified within the NDMP resource are specific to one client.
352+
In general, the properties specified within the NDMP resource are specific to one client.
353353

354354
### WebUI
355355
`Class ::bareos::webui`

Rakefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ desc 'Validate manifests, templates, and ruby files'
4646
task :validate do
4747
Dir['manifests/**/*.pp'].each do |manifest|
4848
sh "puppet parser validate --noop #{manifest}"
49+
# check if none us ascii chars exists
50+
sh "tr -d \\\\000-\\\\177 < #{manifest} | wc -c | grep -q 0"
4951
end
5052
Dir['spec/**/*.rb', 'lib/**/*.rb'].each do |ruby_file|
5153
sh "ruby -c #{ruby_file}" unless ruby_file =~ %r{spec/fixtures}

manifests/client/client.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# == Class: bareos::client::client
2-
# The Client Resource (or FileDaemon) resource defines the name of the Client (as used by the Director)
2+
# The Client Resource (or FileDaemon) resource defines the name of the Client (as used by the Director)
33
# as well as the port on which the Client listens for Director connections.
44
#
55
# == Parameters

manifests/client/director.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# == Define: bareos::client::director
2-
# The Director resource defines the name and password of the Directors that are permitted to contact this Client.
2+
# The Director resource defines the name and password of the Directors that are permitted to contact this Client.
33
#
44
# == Parameters
55
# [*ensure*]

manifests/client/messages.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# == Define: bareos::client::messages
2-
# The Messages resource defines how messages are to be handled and destinations to which they should be sent.
2+
# The Messages resource defines how messages are to be handled and destinations to which they should be sent.
33
#
44
# == Parameters
55
# [*ensure*]

manifests/console/director.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# == Define: bareos:console::director
2-
# The Director resource defines the attributes of the Director running on the network.
3-
# You may have multiple Director resource specifications in a single Console configuration file.
2+
# The Director resource defines the attributes of the Director running on the network.
3+
# You may have multiple Director resource specifications in a single Console configuration file.
44
# If you have more than one, you will be prompted to choose one when you start the Console program.
55
#
66
# == Parameters

manifests/director/catalog.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# == Define: bareos::director::catalog
2-
# To define in what database to keep the list of files and the Volume names where they are backed up.
2+
# To define in what database to keep the list of files and the Volume names where they are backed up.
33
# Most people only use a single catalog.
44
# It is possible, however not adviced and not supported to use multiple catalogs.
55
#

manifests/director/client.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# == Define: bareos::director::client
2-
# To define what Client is to be backed up.
3-
# You will generally have multiple Client definitions.
2+
# To define what Client is to be backed up.
3+
# You will generally have multiple Client definitions.
44
# Each Job will reference only a single client.
55
#
66
# == Parameters

manifests/director/counter.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# == Define: bareos::director::counter
2-
# The Counter Resource defines a counter variable that can be accessed by variable expansion used
2+
# The Counter Resource defines a counter variable that can be accessed by variable expansion used
33
# for creating Volume labels with the Label Format Dir Pool directive.
44
#
55
# == Parameters

manifests/director/director.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# == Class: bareos::director::director
2-
# To define the Directors name and its access password used for authenticating the Console program.
3-
# Only a single Director resource definition may appear in the Director’s configuration file.
2+
# To define the Director's name and its access password used for authenticating the Console program.
3+
# Only a single Director resource definition may appear in the Director's configuration file.
44
#
55
# == Parameters
66
# [*ensure*]

0 commit comments

Comments
 (0)