← Back to branch summary

~ubuntu-branches/ubuntu/lucid/puppet/lucid-security

« back to all changes in this revision

Viewing changes to ext/puppetstoredconfigclean.rb

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-12-23 00:48:10 UTC
  • mfrom: (1.1.10 upstream) (3.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091223004810-3i4oryds922g5n59
Tags: 0.25.1-3ubuntu1
* Merge from debian testing.  Remaining changes:
  - debian/rules:
    + Don't start puppet when first installing puppet.
  - debian/puppet.conf, lib/puppet/defaults.rb:
    + Move templates to /etc/puppet
  - lib/puppet/defaults.rb:
    + Fix /var/lib/puppet/state ownership.
  - man/man8/puppet.conf.8: 
    + Fix broken URL in manpage.
  - debian/control:
    + Update maintainer accordint to spec.
    + Puppetmaster Recommends -> Suggests
    + Created puppet-testsuite as a seperate. Allow the users to run puppet's 
      testsuite.
  - tests/Rakefile: Fix rakefile so that the testsuite can acutally be ran.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/puppetstoredconfigclean.rb
11
11
config = '/etc/puppet/puppet.conf'
12
12
 
13
13
def printusage(error_code)
14
 
        puts "Usage: #{$0} [ list of hostnames as stored in hosts table ]"
15
 
        puts "\n Options:"
16
 
        puts "--config <puppet config file>"
17
 
        exit(error_code)
 
14
    puts "Usage: #{$0} [ list of hostnames as stored in hosts table ]"
 
15
    puts "\n Options:"
 
16
    puts "--config <puppet config file>"
 
17
    exit(error_code)
18
18
end
19
19
 
20
20
opts = GetoptLong.new(
21
 
        [ "--config",     "-c",   GetoptLong::REQUIRED_ARGUMENT ],      
 
21
        [ "--config",     "-c",   GetoptLong::REQUIRED_ARGUMENT ],
22
22
        [ "--help",        "-h",   GetoptLong::NO_ARGUMENT ],
23
23
        [ "--usage",       "-u",   GetoptLong::NO_ARGUMENT ],
24
24
        [ "--version",     "-v",   GetoptLong::NO_ARGUMENT ]
25
25
)
26
26
 
27
27
begin
28
 
        opts.each do |opt, arg|
29
 
        case opt
30
 
                when "--config"
31
 
                                config = arg
32
 
 
33
 
            when "--help"
34
 
                printusage(0)
35
 
 
36
 
            when "--usage"
37
 
                printusage(0)
38
 
 
39
 
            when "--version"
40
 
                        puts "%s" % Puppet.version
41
 
                                exit
42
 
                end
43
 
        end
 
28
    opts.each do |opt, arg|
 
29
        case opt
 
30
        when "--config"
 
31
            config = arg
 
32
 
 
33
        when "--help"
 
34
            printusage(0)
 
35
 
 
36
        when "--usage"
 
37
            printusage(0)
 
38
 
 
39
        when "--version"
 
40
            puts "%s" % Puppet.version
 
41
            exit
 
42
        end
 
43
    end
44
44
rescue GetoptLong::InvalidOption => detail
45
45
    $stderr.puts "Try '#{$0} --help'"
46
46
    exit(1)
57
57
args = {:adapter => adapter, :log_level => pm_conf[:rails_loglevel]}
58
58
 
59
59
case adapter
60
 
  when "sqlite3":
61
 
    args[:dbfile] = pm_conf[:dblocation]
62
 
  when "mysql", "postgresql":
63
 
    args[:host]     = pm_conf[:dbserver] unless pm_conf[:dbserver].to_s.empty?
64
 
    args[:username] = pm_conf[:dbuser] unless pm_conf[:dbuser].to_s.empty?
65
 
    args[:password] = pm_conf[:dbpassword] unless pm_conf[:dbpassword].to_s.empty?
66
 
    args[:database] = pm_conf[:dbname] unless pm_conf[:dbname].to_s.empty?
67
 
    socket          = pm_conf[:dbsocket]
68
 
    args[:socket]   = socket unless socket.to_s.empty?
69
 
  else
70
 
    raise ArgumentError, "Invalid db adapter %s" % adapter
 
60
    when "sqlite3"
 
61
        args[:dbfile] = pm_conf[:dblocation]
 
62
    when "mysql", "postgresql"
 
63
        args[:host]     = pm_conf[:dbserver] unless pm_conf[:dbserver].to_s.empty?
 
64
        args[:username] = pm_conf[:dbuser] unless pm_conf[:dbuser].to_s.empty?
 
65
        args[:password] = pm_conf[:dbpassword] unless pm_conf[:dbpassword].to_s.empty?
 
66
        args[:database] = pm_conf[:dbname] unless pm_conf[:dbname].to_s.empty?
 
67
        socket          = pm_conf[:dbsocket]
 
68
        args[:socket]   = socket unless socket.to_s.empty?
 
69
    else
 
70
        raise ArgumentError, "Invalid db adapter %s" % adapter
71
71
end
72
72
 
73
73
args[:database] = "puppet" unless not args[:database].to_s.empty?