0003-Removed-extra-whitespace-from-end-of-lines.patch

Ian Taylor, 06/05/2009 04:13 pm

Download (819.7 kB)

b/CHANGELOG
1 1
0.25.0
2
    Fixed #2280 - Detailed exit codes fix 
2
    Fixed #2280 - Detailed exit codes fix
3 3

  
4 4
    Fixed #198 - Puppet man pages added
5 5

  
......
25 25

  
26 26
0.24.8
27 27
    Fixed #2077 - ralsh user broken on OSX
28
    
28

  
29 29
    Fixed #2004 - ssh_authorized_key fails if no target is defined
30 30

  
31 31
    Fixed #1629 - incorrect permissions on ssh_authorized_keys created files
......
44 44

  
45 45
    Fixed #1871 - Sensitive information leaked in log reports
46 46

  
47
    Fixed #1956 - Cleaned up variable names to be more sane, clarified error messages 
47
    Fixed #1956 - Cleaned up variable names to be more sane, clarified error messages
48 48
    and fixed incorrect use of 'value' variable rather than 'member'.
49
    
49

  
50 50
    Fixed #1831 - Added sprintf function
51 51

  
52 52
    Fixed #1830 - Added regsubst function
......
55 55

  
56 56
    Fixing #1948 and #1953 - augeas ins bug: wrong number of arguments (1 for 3)
57 57

  
58
    Fixing #944 - changing error message from warning to info - connection recycled 
58
    Fixing #944 - changing error message from warning to info - connection recycled
59 59

  
60 60
    Fixed #961 - puppetd creating too many/not closing TCP connections
61 61

  
......
70 70
    Fixed #1884 - Exported resources are marked as unexported when collected on the exporting host
71 71

  
72 72
    Fixed #1922 - Functions squash all arguments into a single hash
73
    
73

  
74 74
    Fixed #1538 - Yumrepo sets permissions wrongly on files in /etc/yum.repos.d
75 75

  
76 76
    Fixed #1936 - Added /* */ support to the vim file
......
78 78
    Fixed #1541 -  nagios objects write files to clientbucket on every change
79 79

  
80 80
    Fixed #1542 - cannot purge nagios objects
81
 
81

  
82 82
    Fixing #1912 - gid still works with no 'should' value fixing ralsh issues
83 83

  
84 84
    Fixing the Rakefile to use 'git format-patch'
......
93 93

  
94 94
    Updated Red Hat spec file 0.24.7
95 95

  
96
    Fixed #1920 - Shadow password corruption 
97
 
96
    Fixed #1920 - Shadow password corruption
97

  
98 98
0.24.7
99 99
    Fixed #1804 - Added VDev and MultiVDev properties to the ZPool type
100 100

  
......
156 156

  
157 157
    Fixed #1711 - fileserver test fails due to incorrect mocking
158 158

  
159
    Fixed #1751 - Mac OS X DirectoryService nameservice provider support for 
160
    plist output and password hash fil 
161
   
162
    Fixed #1752 - Add an optional argument to Puppet::Util.execute to determine 
159
    Fixed #1751 - Mac OS X DirectoryService nameservice provider support for
160
    plist output and password hash fil
161

  
162
    Fixed #1752 - Add an optional argument to Puppet::Util.execute to determine
163 163
    whether stderr and stdout are combined in the output
164
    
164

  
165 165
    Added versionable feature to the RPM provider
166
    
166

  
167 167
    Fixed #1668 - puppetca can't clean unsigned certs
168 168

  
169 169
    Moved RRD feature from util/metric.rb to feature/base.rb
......
200 200

  
201 201
    Updated Red Hat spec file for 0.24.6
202 202

  
203
    Removed conf/debian directory - Debian packaging information 
203
    Removed conf/debian directory - Debian packaging information
204 204
    now maintained downstream
205 205

  
206 206
    Added augeas type
......
211 211
    Added multiline comment support
212 212

  
213 213
0.24.6
214
    Adding support to the user type for: profiles, auths, project, 
214
    Adding support to the user type for: profiles, auths, project,
215 215
    key/value pairs (extension to Solaris RBAC support added in
216 216
    0.24.6)
217 217

  
......
223 223

  
224 224
    Fixed #1655 - Provider::Confine::Variable tests are broken
225 225

  
226
    Fixed #1646 - service puppet status does not work as non-root 
226
    Fixed #1646 - service puppet status does not work as non-root
227 227
    on redhat system
228 228

  
229 229
    Fixed #1649 - Updated OSX package cleanup
230
  
230

  
231 231
    Fixed #1647 - puppetdoc -r providers now working again
232 232

  
233 233
    Fixed #1639 - uninitialized constant Puppet::Type::User::ProviderUseradd
234 234

  
235
    Fixed #1637 - With an inexistant (global) templatedir, modules 
235
    Fixed #1637 - With an inexistant (global) templatedir, modules
236 236
    can't access their templates
237 237

  
238 238
    Fixed #1202 - Collection attribute matching doesn't parse arrays
239 239

  
240
    Fixed #1473 - Puppetd stops with error after puppetmasterd 
240
    Fixed #1473 - Puppetd stops with error after puppetmasterd
241 241
    is unavailable
242 242

  
243 243
    Fixed #1354 - yum provider problems with RHEL 3
......
249 249
    Fixing #947 - pluginsync no longer fails poorly when no plugins exist
250 250

  
251 251
    Fixed #981 - Removed 'Adding aliases' info message
252
    
252

  
253 253
    Fixing #1089 - Log messages are now tagged with the log level,
254 254
    making it easier to match messages in the 'tagmail' report.
255
    
255

  
256 256
    Fixing #1098 - Multiline strings now correctly increment the line count
257 257

  
258 258
    Fixing #1614 - Environments no longer have to be listed out
259 259

  
260
    Fixed #1628 - Changed node search to use certname rather than Facter 
260
    Fixed #1628 - Changed node search to use certname rather than Facter
261 261
    hostname
262
    
263
    Fixed #1613 - The client environment will be substituted when looking 
262

  
263
    Fixed #1613 - The client environment will be substituted when looking
264 264
    up settings.
265 265

  
266
    Updated puppet binary documentation 
266
    Updated puppet binary documentation
267 267

  
268 268
    Feature #1624 - Added RBAC roles to solaris user provider
269 269

  
......
292 292
    Fixed #791 - You should now be able to create and find a user/group in one transaction.
293 293

  
294 294
    Fixed #1610 - Raise "Filebucketed" messages to Notice priority
295
    
295

  
296 296
    FIxed #1530 - ssh_authorized_keys provider does not crash anymore on SSH type 1 keys
297 297

  
298 298
    Added a number of confines to package providers
299 299

  
300
    Fixed #1609 - Added confines for the Gentoo, FreeBSD and 
301
    SMF (Solaris) service providers 
300
    Fixed #1609 - Added confines for the Gentoo, FreeBSD and
301
    SMF (Solaris) service providers
302 302

  
303 303
    Fixed #1608 - Added ubuntu to defaultfor for apt provider
304 304

  
......
306 306
    provider
307 307

  
308 308
    Fixed #1045 - Multiple metaparams all get added to resources.
309
    
310
    Fixed #1472 -- defined, exported resources in the current compile 
309

  
310
    Fixed #1472 -- defined, exported resources in the current compile
311 311
    now get expanded correctly.
312 312

  
313 313
    Fixed #1595 - Internally, Property#retrieve is no longer called
314 314
    when no 'should' value is available for a resource.
315 315

  
316
    Fixed #1588 - Fixed puppetca --clean --all 
316
    Fixed #1588 - Fixed puppetca --clean --all
317 317

  
318 318
    Fixed #1584 - Added support for appended variables
319 319

  
......
324 324
    Fixed #1579 and #1580 - errors in the Puppet RPM spec file
325 325

  
326 326
    Fixed #1572 -- file purging now fails if remote sources do not exist.
327
    
327

  
328 328
    Fixed #1521 -- ldap user and password are now used with the default connection.
329 329

  
330 330
    Fixed issues with file descriptors leaking into subprocesses
......
338 338
    Adjusted hpuxuseradd user provider to confine to HP-UX and fixed HP-UX user provider path regression
339 339

  
340 340
    Fixed debug messages in package type - thanks to Todd Zullinger for this fix
341
    
341

  
342 342
    Fixed #1566 - changed password property of the user type
343 343

  
344 344
    Fixed debug messages in package type
......
362 362
    Fixed #1526 - Fixed leak in template
363 363

  
364 364
    Fixed #1506 - Removed storeconfig duplicate indexes
365
    
365

  
366 366
    Fixed #1457 - case insensitive match for error
367
    
368
    Fixed #1488 - Moved individual functions out of functions.rb into 
367

  
368
    Fixed #1488 - Moved individual functions out of functions.rb into
369 369
    lib/puppet/parser/functions directory.  New functions should be create     in this directory.
370 370

  
371 371
    Fixed #1508 - Added HP-UX package provider
......
377 377
    Add the -P/--ping option to puppetrun, fixes #1501
378 378

  
379 379
    Fixed #1394 - Added stored configuration clearing script to /ext
380
    
380

  
381 381
    Fixed #1442 - replaced use of Facter for report titling with certname
382 382

  
383 383
    Fixed $1456 - add proxy configuration capability to yum repo
......
390 390

  
391 391
    Expose all puppet variables as instance member variables of the template wrapper.
392 392
    This helps resolve redmine #1427, by providing a safe mechanism to access variables.
393
    
393

  
394 394
     * Implement Puppet::Parser::Scope#to_hash, which returns a hash containing all the
395 395
       variable bindings in the current and, optionally, parent scope.
396 396
     * Use that to set instance member variables into Puppet::Parser::Templatewrapper
......
403 403
    interpolation, not both, to avoid issues where a #{} interpolated value
404 404
    contains a % character.
405 405

  
406
    Feature #1476: Allow specification of --bindir --sbindir --sitelibdir --mandir --destdir 
406
    Feature #1476: Allow specification of --bindir --sbindir --sitelibdir --mandir --destdir
407 407
    in installation
408
    
408

  
409 409
    Added feature #1241 : Improve performance of group lookups
410 410

  
411
    Fixed bug #1448: Puppet CA incorrectly writes out all certs to inventory .txt on each 
411
    Fixed bug #1448: Puppet CA incorrectly writes out all certs to inventory .txt on each
412 412
    certificate signing
413 413

  
414
    Fixing puppetlast to make it work with 0.24.5 / 0.25.  Made puppetlast work on 0.24.5 
414
    Fixing puppetlast to make it work with 0.24.5 / 0.25.  Made puppetlast work on 0.24.5
415 415
    by using the YAML indirector
416
 
416

  
417 417
0.24.5
418 418
    You can now select the encoding format when transferring the catalog,
419 419
    with 'yaml' still being the default but 'marshal' being an option.
......
433 433

  
434 434
    Updated /spec/unit/rails.rb test
435 435

  
436
    Fix #1426 - services on redhat are restarted again and status is 
436
    Fix #1426 - services on redhat are restarted again and status is
437 437
    called from the Red Hat provider
438 438

  
439 439
    Fixed #1414 - Return code from waitpid now right shifted 8 bits
440 440

  
441
    Fixed #174 - a native type type for managing ssh authorized_keys 
441
    Fixed #174 - a native type type for managing ssh authorized_keys
442 442
    files is available.
443 443

  
444 444
    Further moves from the examples directory and ext directory
......
448 448
    Moved debian to conf and updated examples directory
449 449

  
450 450
    Fixed #1368 - updated Red Hat init scripts
451
 
451

  
452 452
    Added message referencing ReductiveLabs build library
453 453

  
454 454
    Fixed #1396 - Added sha1 function from DavidS to core
455
    
455

  
456 456
    Fixed #1399 - the ldap user provider now knows it can manage
457 457
    passwords.
458
    
458

  
459 459
    Fixed #1272 - if you provide a group name as the gid to an ldap
460 460
    user, the name will be converted to a gid.  Note that this only
461 461
    looks up ldap groups, at this point; if you want to set an ldap
......
468 468

  
469 469
    Fixed 1240 - puppet will function more like puppetd if graphing
470 470
    or reporting are enabled.
471
    
471

  
472 472
    Fixed #1231 - Exceptions during initialization should now be clearer.
473 473

  
474 474
    Fixed #1006 - puppetrun --class works again.  I added the class
......
484 484
    Fixed #1367 - Updated Rakefile for new daily builds
485 485

  
486 486
    Fixed #1370 - removed test/util/loadedfile.rb tests
487
    
487

  
488 488
    Fixed #1221 - aliases to titles now work for resources.
489
    
489

  
490 490
    Fixed #1012 - templates in the templatedir are preferred to module templates.
491 491

  
492 492
    Fixed #707 - special '@reboot'-style cron jobs work again.
......
495 495

  
496 496
    Fixed #1369 - the init service provider now supports HP-UX.
497 497

  
498
    Removed support for the 'node_name' setting in LDAP and external node 
498
    Removed support for the 'node_name' setting in LDAP and external node
499 499
    lookups.
500 500

  
501 501
    Also removed support for 'default' nodes in external nodes.
502 502
    LDAP nodes now use the certificate name, the short name, and 'default',
503 503
    but external nodes just use the certificate name and any custom terminus
504 504
    types will use just the certificate name.
505
    
505

  
506 506
    Fixing #1168 (for 0.24.x) -- automatically downcasing the fqdn.
507 507
    Also requiring that passed in certnames be downcased; the setting
508 508
    system isn't currently flexible enough to automatically downcase
......
520 520
    The Master handler previously provided the support for the :node_name
521 521
    setting, and that functionality has now been moved into the Node
522 522
    class.  At the same time, the names to search through have been
523
    changed somewhat:  Previously, the certificate name and the 
523
    changed somewhat:  Previously, the certificate name and the
524 524
    hostname were both used for searching, but now, the cert name
525 525
    is always searched first (unless node_name == facter), but only
526 526
    the Facter hostname, domain, and fqdn are used otherwise.  We no
......
530 530

  
531 531
    Adding support for settings within the existing Facter provider confines.
532 532

  
533
    Moving all confine code out of the Provider class, and fixing #1197. 
534
    Created a Confiner module for the Provider class methods, enhanced 
535
    the interface between it and the Confine class to make sure binary 
533
    Moving all confine code out of the Provider class, and fixing #1197.
534
    Created a Confiner module for the Provider class methods, enhanced
535
    the interface between it and the Confine class to make sure binary
536 536
    paths are searched for fresh each time.
537 537

  
538 538
    Modified the 'factpath' setting to automatically configure
539 539
    Facter to load facts there if a new enough version of
540 540
    Facter is used.
541 541

  
542
    Crontab provider: fix a parse error when a line begins with a space 
542
    Crontab provider: fix a parse error when a line begins with a space
543 543
    character (fixes #1216)
544 544

  
545
    Instead of deleting the init scripts (with --del) we should simply 
546
    disable it with chkconfig service off, and respectfully do the same 
545
    Instead of deleting the init scripts (with --del) we should simply
546
    disable it with chkconfig service off, and respectfully do the same
547 547
    for enable => true;
548
 
548

  
549 549
    Added ldap providers for users and groups.
550 550

  
551 551
    Added support for the --all option to puppetca --clean.  If
552 552
    puppetca --clean --all is issued then all client certificates
553 553
    are removed.
554
 
554

  
555 555
    Resources now return the 'should' value for properties from
556 556
    the [] accessor method (they previously threw an exception when
557 557
    this method was used with properties).  This shouldn't have any
......
617 617
    that it can cause corruption, especially in file serving (but
618 618
    it's client-side corruption).
619 619

  
620
    Applying patch by Ryan McBride to fix OpenBSD package 
620
    Applying patch by Ryan McBride to fix OpenBSD package
621 621
    matching.  The actual problem was caused by the fix to #1001.
622 622

  
623 623
    Found all instances of methods where split() is used without
......
867 867
    the bootproto (#762).
868 868

  
869 869
    You now must specify an environment and you are required to specify
870
    the valid environments for your site. (#911) 
870
    the valid environments for your site. (#911)
871 871

  
872 872
    Certificates now always specify a subjectAltName, but it defaults
873 873
    to '*', meaning that it doesn't require DNS names to match.  You
......
998 998
    exactly the feature asked for, but I could not find a
999 999
    way to directly copy ActiveRecord's concept of an environment.
1000 1000

  
1001
    External node sources can now return undefined classes (#687). 
1001
    External node sources can now return undefined classes (#687).
1002 1002

  
1003 1003
    Puppet clients now have http proxy support (#701).
1004 1004

  
......
1051 1051

  
1052 1052
        Only ONE node source can be used -- you can use LDAP, code, or
1053 1053
        an external node program, but not more than one.
1054
    
1054

  
1055 1055
        LDAP node support has two changes:  First, the "ldapattrs" attribute is
1056 1056
        now used for setting the attributes to retrieve from the server (in
1057 1057
        addition to required attriutes), and second, all retrieved attributes
......
1066 1066
        handle that on its own.
1067 1067

  
1068 1068
    Reworked the database schema used to store configurations with the
1069
    storeconfigs option.  
1070
    
1069
    storeconfigs option.
1070

  
1071 1071
    Replaced the obsolete RRD ruby library with the maintained
1072 1072
    RubyRRDtool library (which requires rrdtool2) (#659).
1073 1073

  
......
1140 1140
    fail on cycles.
1141 1141

  
1142 1142
    Added a 'dynamicfacts' configuration option; any facts in that
1143
    comma-separated list will be ignored when comparing facts to 
1143
    comma-separated list will be ignored when comparing facts to
1144 1144
    see if they have changed and thus whether a recompile is necessary.
1145 1145

  
1146 1146
    Renamed some poorly named internal variables:
......
1312 1312
    Fixing a bug related to link recursion that caused link directories
1313 1313
    to always be considered out of sync.
1314 1314

  
1315
    The bind address for puppetmasterd can now be specified with 
1315
    The bind address for puppetmasterd can now be specified with
1316 1316
    --bindaddress.
1317 1317

  
1318 1318
    Added (probably experimental) mongrel support.  At this point you're
......
1492 1492
    Correctly handling spaces in file sources.
1493 1493

  
1494 1494
    Moved documentation into svn tree.
1495
    
1495

  
1496 1496
0.18.0
1497 1497
    Added support for a "default" node.
1498 1498

  
......
1690 1690

  
1691 1691
0.9.4
1692 1692
    Small fix to wrap the StatusServer class in the checks for required classes.
1693
    
1693

  
1694 1694
0.9.3
1695 1695
    Fixed some significant bugs in cron job management.
1696 1696

  
b/LICENSE
3 3
Reductive Labs can be contacted at: info@reductivelabs.com
4 4

  
5 5
This program and entire repository is free software; you can
6
redistribute it and/or modify it under the terms of the GNU 
7
General Public License as published by the Free Software 
6
redistribute it and/or modify it under the terms of the GNU
7
General Public License as published by the Free Software
8 8
Foundation; either version 2 of the License, or any later version.
9 9

  
10 10
This program is distributed in the hope that it will be useful,
b/README
1
Documentation (and detailed install instructions) can be found 
1
Documentation (and detailed install instructions) can be found
2 2
online at http://reductivelabs.com/trac/puppet/wiki/DocumentationStart .
3 3

  
4 4
Generally, you need the following things installed:
b/README.rst
1 1
Puppet
2 2
======
3 3

  
4
Puppet, an automated administrative engine for your Linux and Unix systems, performs 
5
administrative tasks (such as adding users, installing packages, and updating server 
4
Puppet, an automated administrative engine for your Linux and Unix systems, performs
5
administrative tasks (such as adding users, installing packages, and updating server
6 6
configurations) based on a centralized specification.
7 7

  
8
Documentation (and detailed install instructions) can be found 
8
Documentation (and detailed install instructions) can be found
9 9
online at the `Puppet Wiki`_.
10 10

  
11 11
Installation
......
32 32
  the library.
33 33

  
34 34
* Facter => 1.1.1
35
  You can get this from your package management system or the `Facter site`_ 
35
  You can get this from your package management system or the `Facter site`_
36 36

  
37 37
.. _Puppet Wiki: http://reductivelabs.com/trac/puppet/wiki/DocumentationStart
38 38
.. _Facter site: http://reductivelabs.com/projects/facter
b/Rakefile
54 54
task :tracdocs do
55 55
    require 'puppet'
56 56
    require 'puppet/util/reference'
57
    Puppet::Util::Reference.references.each do |ref| 
57
    Puppet::Util::Reference.references.each do |ref|
58 58
        sh "puppetdoc -m trac -r #{ref.to_s}"
59 59
    end
60 60
end
......
65 65
    require 'spec/rake/spectask'
66 66
    # require 'rcov'
67 67
    Spec::Rake::SpecTask.new do |t|
68
        t.spec_opts = ['--format','s', '--loadby','mtime'] 
68
        t.spec_opts = ['--format','s', '--loadby','mtime']
69 69
        t.spec_files = FileList['spec/**/*.rb']
70 70
    end
71 71
end
......
83 83
        require 'ci/reporter/rake/rspec'
84 84
        require 'ci/reporter/rake/test_unit'
85 85
        ENV['CI_REPORTS'] = 'results'
86
    rescue LoadError 
86
    rescue LoadError
87 87
       puts 'Missing ci_reporter gem. You must have the ci_reporter gem installed to run the CI spec tests'
88
    end 
88
    end
89 89
end
90 90

  
91 91
desc "Run the CI RSpec tests"
......
104 104
        raise "Could not get branch from 'git status'"
105 105
    end
106 106
    branch = $1
107
    
107

  
108 108
    unless branch =~ %r{^([^\/]+)/([^\/]+)/([^\/]+)$}
109 109
        raise "Branch name does not follow <type>/<parent>/<name> model; cannot autodetect parent branch"
110 110
    end
......
136 136
    mkdir(CHANGELOG_DIR) unless File.directory?(CHANGELOG_DIR)
137 137
    change_body=`git log --pretty=format:'%aD%n%an <%ae>%n%s%n'`
138 138
    File.open(File.join(CHANGELOG_DIR, "CHANGELOG.git"), 'w') do |f|
139
        f << change_body 
139
        f << change_body
140 140
    end
141
 
141

  
142 142
    # Changelog commit
143 143
    `git add #{CHANGELOG_DIR}/CHANGELOG.git`
144 144
    `git commit -m "Update CHANGELOG.git"`
b/bin/filebucket
45 45
#   /etc/passwd: 429b225650b912a2ee067b0a4cf1e949
46 46
#   $ filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949
47 47
#   $
48
# 
48
#
49 49
# = Options
50 50
#
51 51
# Note that any configuration parameter that's valid in the configuration file
......
98 98
require 'puppet/application/filebucket'
99 99

  
100 100
# launch the filebucket
101
Puppet::Application[:filebucket].run
101
Puppet::Application[:filebucket].run
b/bin/puppetdoc
8 8
#
9 9
# = Usage
10 10
#
11
#   puppetdoc [-a|--all] [-h|--help] [-o|--outputdir <rdoc outputdir>] [-m|--mode <text|pdf|trac|rdoc>] 
11
#   puppetdoc [-a|--all] [-h|--help] [-o|--outputdir <rdoc outputdir>] [-m|--mode <text|pdf|trac|rdoc>]
12 12
#             [-r|--reference <[type]|configuration|..>] [manifest-file]
13 13
#
14 14
# = Description
......
19 19
# available on the Reductive Labs web site.
20 20
#
21 21
# In 'rdoc' mode, this command generates an html RDoc hierarchy describing the manifests that
22
# are in 'manifestdir' and 'modulepath' configuration directives. 
22
# are in 'manifestdir' and 'modulepath' configuration directives.
23 23
# The generated documentation directory is doc by default but can be changed with the 'outputdir' option.
24 24
#
25 25
# If the command is started with 'manifest-file' command-line arguments, puppetdoc generate a single
b/bin/ralsh
64 64
# = Example
65 65
#
66 66
# This example uses ``ralsh`` to return Puppet configuration for the user ``luke``::
67
#   
67
#
68 68
#    $ ralsh user luke
69 69
#    user { 'luke':
70 70
#      home => '/home/luke',
b/conf/auth.conf
1 1
# This is an example auth.conf file, it mimics the puppetmasterd defaults
2
# 
2
#
3 3
# The ACL are checked in order of appearance in this file.
4
# 
4
#
5 5
# Supported syntax:
6
# This file supports two different syntax depending on how 
6
# This file supports two different syntax depending on how
7 7
# you want to express the ACL.
8
# 
8
#
9 9
# Path syntax (the one used below):
10 10
# ---------------------------------
11 11
# path /path/to/resource
......
14 14
# [auth[enthicated] {yes|no|on|off|any}]
15 15
# allow [host|ip|*]
16 16
# deny [host|ip]
17
# 
17
#
18 18
# The path is matched as a prefix. That is /file match at
19 19
# the same time /file_metadat and /file_content.
20
# 
20
#
21 21
# Regex syntax:
22 22
# -------------
23 23
# This one is differenciated from the path one by a '~'
24
# 
24
#
25 25
# path ~ regex
26 26
# [environment envlist]
27 27
# [method methodlist]
28 28
# [auth[enthicated] {yes|no|on|off|any}]
29 29
# allow [host|ip|*]
30 30
# deny [host|ip]
31
# 
31
#
32 32
# The regex syntax is the same as ruby ones.
33
# 
33
#
34 34
# Ex:
35 35
# path ~ .pp$
36 36
# will match every resource ending in .pp (manifests files for instance)
37
# 
37
#
38 38
# path ~ ^/path/to/resource
39 39
# is essentially equivalent to path /path/to/resource
40
# 
40
#
41 41
# environment:: restrict an ACL to a specific set of environments
42 42
# method:: restrict an ACL to a specific set of methods
43 43
# auth:: restrict an ACL to an authenticated or unauthenticated request
44 44
# the default when unspecified is to restrict the ACL to authenticated requests
45
# (ie exactly as if auth yes was present). 
45
# (ie exactly as if auth yes was present).
46 46
#
47 47

  
48 48
### Authenticated ACL - those applies only when the client
b/conf/osx/createpackage.sh
7 7
# Last Updated: 2008-07-31
8 8
#
9 9
# Copyright 2008 Google Inc.
10
# 
10
#
11 11
# Licensed under the Apache License, Version 2.0 (the "License");
12 12
# you may not use this file except in compliance with the License.
13 13
# You may obtain a copy of the License at
14
# 
14
#
15 15
#      http://www.apache.org/licenses/LICENSE-2.0
16
# 
16
#
17 17
# Unless required by applicable law or agreed to in writing, software
18 18
# distributed under the License is distributed on an "AS IS" BASIS,
19 19
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
......
30 30

  
31 31

  
32 32
function find_installer() {
33
  # we walk up three directories to make this executable from the root, 
33
  # we walk up three directories to make this executable from the root,
34 34
  # root/conf or root/conf/osx
35 35
  if [ -f "./${INSTALLRB}" ]; then
36 36
    installer="$(pwd)/${INSTALLRB}"
......
63 63
  # to look at for package creation and substitue the version strings out.
64 64
  # Major/Minor versions can only be integers, so we have "0" and "245" for
65 65
  # puppet version 0.24.5
66
  # Note too that for 10.5 compatibility this Info.plist *must* be set to 
66
  # Note too that for 10.5 compatibility this Info.plist *must* be set to
67 67
  # follow symlinks.
68 68
  VER1=$(echo ${puppet_version} | awk -F "." '{print $1}')
69 69
  VER2=$(echo ${puppet_version} | awk -F "." '{print $2}')
......
74 74
  sed -i '' "s/{SHORTVERSION}/${puppet_version}/g" "${pkgtemp}/${PROTO_PLIST}"
75 75
  sed -i '' "s/{MAJORVERSION}/${major_version}/g" "${pkgtemp}/${PROTO_PLIST}"
76 76
  sed -i '' "s/{MINORVERSION}/${minor_version}/g" "${pkgtemp}/${PROTO_PLIST}"
77
  
77

  
78 78
  # We need to create a preflight script to remove traces of previous
79 79
  # puppet installs due to limitations in Apple's pkg format.
80 80
  mkdir "${pkgtemp}/scripts"
81 81
  cp "${puppet_root}/conf/osx/${PREFLIGHT}" "${pkgtemp}/scripts"
82
  
82

  
83 83
  # substitute in the sitelibdir specified above on the assumption that this
84 84
  # is where any previous puppet install exists that should be cleaned out.
85 85
  sed -i '' "s|{SITELIBDIR}|${SITELIBDIR}|g" "${pkgtemp}/scripts/${PREFLIGHT}"
......
123 123
  fi
124 124

  
125 125
  find_installer
126
  
126

  
127 127
  if [ ! "${installer}" ]; then
128 128
    echo "Unable to find ${INSTALLRB}"
129 129
    cleanup_and_exit 1
130 130
  fi
131 131

  
132 132
  find_puppet_root
133
  
133

  
134 134
  if [ ! "${puppet_root}" ]; then
135 135
    echo "Unable to find puppet repository root."
136 136
    cleanup_and_exit 1
137 137
  fi
138
  
138

  
139 139
  pkgroot=$(mktemp -d -t puppetpkg)
140
  
140

  
141 141
  if [ ! "${pkgroot}" ]; then
142 142
    echo "Unable to create temporary package root."
143 143
    cleanup_and_exit 1
144 144
  fi
145
  
145

  
146 146
  pkgtemp=$(mktemp -d -t puppettmp)
147
  
147

  
148 148
  if [ ! "${pkgtemp}" ]; then
149 149
    echo "Unable to create temporary package root."
150 150
    cleanup_and_exit 1
151 151
  fi
152
  
152

  
153 153
  install_puppet
154 154
  get_puppet_version
155
  
155

  
156 156
  if [ ! "${puppet_version}" ]; then
157 157
    echo "Unable to retrieve puppet version"
158 158
    cleanup_and_exit 1
159 159
  fi
160
  
160

  
161 161
  prepare_package
162 162
  create_package
163
  
163

  
164 164
  cleanup_and_exit 0
165 165
}
166 166

  
b/conf/redhat/server.init
26 26
if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
27 27
    PUPPETMASTER_OPTS="$PUPPETMASTER_OPTS --servertype=mongrel"
28 28
elif [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -eq 1 ]; then
29
    PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}" 
29
    PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}"
30 30
fi
31 31
[ -n "$PUPPETMASTER_LOG" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --logdest=${PUPPETMASTER_LOG}"
32 32
PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} \
......
67 67
    if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
68 68
        for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
69 69
            echo -en "\nPort: ${PUPPETMASTER_PORTS[$i]}"
70
            killproc -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster 
70
            killproc -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster
71 71
            ret=$?; [ $ret != 0 ] && RETVAL=$ret
72 72
        done
73 73
    else
......
93 93
    if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
94 94
        for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
95 95
            echo -en "Port ${PUPPETMASTER_PORTS[$i]}: "
96
            status -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster 
96
            status -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster
97 97
            ret=$?; [ $ret != 0 ] && RETVAL=$ret
98
        done 
98
        done
99 99
    else
100 100
        status $PUPPETMASTER
101 101
        RETVAL=$?
b/conf/redhat/server.sysconfig
5 5
# Specify syslog to send log messages to the system log.
6 6
#PUPPETMASTER_LOG=syslog
7 7

  
8
# You may specify an alternate port or an array of ports on which 
8
# You may specify an alternate port or an array of ports on which
9 9
# puppetmaster should listen. Default is: 8140
10 10
# If you specify more than one port, the puppetmaster ist automatically
11 11
# started with the servertype set to mongrel. This might be interesting
12 12
# if you'd like to run your puppetmaster in a loadbalanced cluster.
13
# Please note: this won't setup nor start any loadbalancer. 
13
# Please note: this won't setup nor start any loadbalancer.
14 14
# If you'd like to run puppetmaster with mongrel as servertype but only
15 15
# on one (specified) port, you have to add --servertype=mongrel to
16 16
# PUPPETMASTER_EXTRA_OPTS.
17
# Default: Empty (Puppetmaster isn't started with mongrel, nor on a 
17
# Default: Empty (Puppetmaster isn't started with mongrel, nor on a
18 18
# specific port)
19 19
#
20 20
# Please note: Due to reduced options in the rc-functions lib in RHEL/Centos
21
# versions prior to 5, this feature won't work. Fedora versions >= 8 are 
21
# versions prior to 5, this feature won't work. Fedora versions >= 8 are
22 22
# known to work.
23 23
#PUPPETMASTER_PORTS=""
24 24
# Puppetmaster on a different port, run with standard webrick servertype
b/conf/solaris/smf/puppetd.xml
20 20
                type='path'>
21 21
        <service_fmri value='file:///etc/puppet/puppet.conf'/>
22 22
    </dependency>
23
        
23

  
24 24
    <dependency name='loopback'
25 25
                grouping='require_all'
26 26
                restart_on='error'
b/conf/solaris/smf/puppetmasterd.xml
20 20
                type='path'>
21 21
        <service_fmri value='file:///etc/puppet/puppet.conf'/>
22 22
    </dependency>
23
        
23

  
24 24
    <dependency name='loopback'
25 25
                grouping='require_all'
26 26
                restart_on='error'
b/conf/suse/client.init
14 14
### BEGIN INIT INFO
15 15
# Provides: puppet
16 16
# Required-Start: $local_fs $network $syslog
17
# Should-Start: 
17
# Should-Start:
18 18
# Required-Stop:
19 19
# Default-Start: 3 4 5
20 20
# Default-Stop: 0 1 2 6
b/conf/suse/puppet.spec
22 22
BuildRequires: ruby >= 1.8.6
23 23

  
24 24
%description
25
Puppet lets you centrally manage every important aspect of your system using a 
26
cross-platform specification language that manages all the separate elements 
27
normally aggregated in different files, like users, cron jobs, and hosts, 
25
Puppet lets you centrally manage every important aspect of your system using a
26
cross-platform specification language that manages all the separate elements
27
normally aggregated in different files, like users, cron jobs, and hosts,
28 28
along with obviously discrete elements like packages, services, and files.
29 29

  
30 30
%package server
......
132 132
* Sat Feb 16 2008 James Turnbull <james@lovedthanlost.net> - 0.24.1-1
133 133
- Fixed puppet configuation file references to match single puppet.conf file
134 134
- Update versions for 0.24.1 release
135
 
135

  
136 136
* Tue Aug  3 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-3
137 137
- Replaced puppet-bin.patch with %build section from David's spec
138 138

  
139 139
* Tue Aug  1 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-2
140 140
- Added supprot for enabling services in SuSE
141
 
141

  
142 142
* Tue Aug  1 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-1
143 143
- New version and support for SuSE
144 144

  
......
150 150

  
151 151
* Mon Jun 19 2006 David Lutterkort <dlutter@redhat.com> - 0.18.0-1
152 152
- Patch config for LSB compliance (lsb-config.patch)
153
- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl 
153
- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl
154 154
  to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt,
155 155
  /etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml
156 156

  
......
173 173
- Rebuilt for new version
174 174

  
175 175
* Wed Mar 22 2006 David Lutterkort <dlutter@redhat.com> - 0.15.1-1
176
- Patch0: Run puppetmaster as root; running as puppet is not ready 
176
- Patch0: Run puppetmaster as root; running as puppet is not ready
177 177
  for primetime
178 178

  
179 179
* Mon Mar 13 2006 David Lutterkort <dlutter@redhat.com> - 0.15.0-1
......
188 188
  allocate the puppet uid/gid dynamically
189 189

  
190 190
* Sun Feb 19 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-4
191
- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed 
191
- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed
192 192
problem with listing fileserver.conf and puppetmaster.conf twice
193 193

  
194 194
* Wed Feb  8 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-3
......
213 213
- Added basic fileserver.conf
214 214

  
215 215
* Wed Jan 11 2006 David Lutterkort <dlutter@redhat.com> - 0.10.1-1
216
- Updated. Moved installation of library files to sitelibdir. Pulled 
216
- Updated. Moved installation of library files to sitelibdir. Pulled
217 217
initscripts into separate files. Folded tools rpm into server
218 218

  
219 219
* Thu Nov 24 2005 Duane Griffin <d.griffin@psenterprise.com>
b/conf/suse/server.init
12 12
### BEGIN INIT INFO
13 13
# Provides: puppetmaster
14 14
# Required-Start: $local_fs $network $syslog
15
# Should-Start: 
15
# Should-Start:
16 16
# Required-Stop:
17 17
# Default-Start: 3 4 5
18 18
# Default-Stop: 0 1 2 6
b/examples/mac_dscl.pp
7 7
Group { provider => "directoryservice" }
8 8

  
9 9
user {
10
    "testgone": 
10
    "testgone":
11 11
        ensure => absent,
12 12
        uid => 550;
13 13
    "testhere":
......
25 25
        ensure => present,
26 26
        gid => 551;
27 27

  
28
}
28
}
b/examples/mac_dscl_revert.pp
7 7
Group { provider => "directoryservice" }
8 8

  
9 9
user {
10
    "testgone": 
10
    "testgone":
11 11
        ensure => absent,
12 12
        uid => 550;
13 13
    "testhere":
b/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
1 1
# Copyright (C) David Schmitt <david@schmitt.edv-bus.at>
2 2
# All rights reserved.
3
# 
3
#
4 4
# Redistribution and use in source and binary forms, with or without
5 5
# modification, are permitted provided that the following conditions
6 6
# are met:
......
12 12
# 3. Neither the name of the Author nor the names of its contributors
13 13
#    may be used to endorse or promote products derived from this software
14 14
#    without specific prior written permission.
15
# 
15
#
16 16
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
17 17
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18 18
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
b/examples/modules/sample-module/manifests/init.pp
1 1
# Jeff McCune <jeff.mccune@northstarlabs.net>
2
# 
2
#
3 3
# Demonstration of a custom parser function and erb template within
4 4
# a module, working in concert.
5 5

  
6 6
class sample-module {
7 7
  $fqdn_to_dn = hostname_to_dn($domain)
8 8
  $sample_template = template("sample-module/sample.erb")
9
  
9

  
10 10
  notice("hostname_to_dn module function returned: [$fqdn_to_dn]")
11 11
  info("sample.erb looks like:\n$sample_template")
12 12
}
... This diff was truncated because it exceeds the maximum size that can be displayed.