diff options
author | Ian Taylor <ian@lorf.org> | 2009-06-05 12:39:04 -0400 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2009-06-06 09:12:00 +1000 |
commit | 4f2c066a97e59a89df64af4b25beac6f3f0553c2 (patch) | |
tree | 126540beec3c65448e01e1b48d27275ec4ee6ea4 /ext | |
parent | 97e6975d69f239e24993315a25a3117b1daa48c3 (diff) | |
download | puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.gz puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.xz puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.zip |
Removed extra whitespace from end of lines
Diffstat (limited to 'ext')
-rw-r--r-- | ext/autotest/config | 12 | ||||
-rw-r--r-- | ext/dbfix.sql | 42 | ||||
-rw-r--r-- | ext/emacs/puppet-mode.el | 20 | ||||
-rwxr-xr-x | ext/puppet-test | 4 | ||||
-rwxr-xr-x | ext/puppetlisten/puppetlisten.rb | 2 | ||||
-rw-r--r-- | ext/rack/README | 12 | ||||
-rw-r--r-- | ext/rack/manifest.pp | 2 | ||||
-rw-r--r-- | ext/vim/syntax/puppet.vim | 6 |
8 files changed, 50 insertions, 50 deletions
diff --git a/ext/autotest/config b/ext/autotest/config index d37c1b2c6..88c37b2d2 100644 --- a/ext/autotest/config +++ b/ext/autotest/config @@ -5,7 +5,7 @@ require 'autotest/redgreen' require 'autotest/timestamp' Autotest.send(:alias_method, :real_find_files, :find_files) -Autotest.send(:define_method, :find_files) do |*args| +Autotest.send(:define_method, :find_files) do |*args| real_find_files.reject do |k, v| if (ENV['AUTOTEST'] and !ENV['AUTOTEST'].empty?) !Regexp.new(ENV['AUTOTEST']).match(k) @@ -15,19 +15,19 @@ end module Autotest::Growl - def self.growl title, msg, img, pri=0, sticky="" - system "growlnotify -n autotest --image #{img} -p #{pri} -m #{msg.inspect} #{title} #{sticky}" + def self.growl title, msg, img, pri=0, sticky="" + system "growlnotify -n autotest --image #{img} -p #{pri} -m #{msg.inspect} #{title} #{sticky}" end Autotest.add_hook :ran_command do |at| - image_root = "~/.autotest_images" + image_root = "~/.autotest_images" results = [at.results].flatten.join("\n") output = results.slice(/(\d+)\stests,\s(\d+)\sassertions,\s(\d+)\sfailures,\s(\d+)\serrors/) if output if $~[3].to_i > 0 || $~[4].to_i > 0 growl "FAIL", "#{output}", "#{image_root}/fail.png", 2 else - growl "Pass", "#{output}", "#{image_root}/pass.png" + growl "Pass", "#{output}", "#{image_root}/pass.png" end end @@ -36,7 +36,7 @@ module Autotest::Growl if $~[2].to_i > 0 || $~[4].to_i > 0 growl "FAIL", "#{output}", "#{image_root}/fail.png", 2 else - growl "Pass", "#{output}", "#{image_root}/pass.png" + growl "Pass", "#{output}", "#{image_root}/pass.png" end end end diff --git a/ext/dbfix.sql b/ext/dbfix.sql index 960369117..3720289b9 100644 --- a/ext/dbfix.sql +++ b/ext/dbfix.sql @@ -1,5 +1,5 @@ -- MySQL DB consistency check/fix --- +-- -- Usage: -- cat dbfix.sql | mysql -u user -p puppet -- @@ -13,11 +13,11 @@ FROM resources AS bad_rows FROM resources GROUP BY title,restype,host_id HAVING count(*) > 1 - ) AS good_rows - ON - good_rows.title = bad_rows.title AND - good_rows.restype = bad_rows.restype AND - good_rows.host_id = bad_rows.host_id AND + ) AS good_rows + ON + good_rows.title = bad_rows.title AND + good_rows.restype = bad_rows.restype AND + good_rows.host_id = bad_rows.host_id AND good_rows.max_id <> bad_rows.id; -- Remove duplicate param_values, and keep the latest one @@ -28,17 +28,17 @@ FROM param_values AS bad_rows FROM param_values GROUP BY value,param_name_id,resource_id HAVING count(*) > 1 - ) AS good_rows - ON - good_rows.value = bad_rows.value AND - good_rows.param_name_id = bad_rows.param_name_id AND - good_rows.resource_id = bad_rows.resource_id AND + ) AS good_rows + ON + good_rows.value = bad_rows.value AND + good_rows.param_name_id = bad_rows.param_name_id AND + good_rows.resource_id = bad_rows.resource_id AND good_rows.max_id <> bad_rows.id; -- rewrite param_values that points to duplicated param_names -- to point to the highest param_name id. -UPDATE - param_values v +UPDATE + param_values v INNER JOIN param_names n ON n.id = v.param_name_id @@ -60,8 +60,8 @@ FROM param_names AS bad_rows FROM param_names GROUP BY name HAVING count(*) > 1 - ) AS good_rows - ON + ) AS good_rows + ON good_rows.name = bad_rows.name AND good_rows.max_id <> bad_rows.id; @@ -73,16 +73,16 @@ FROM resource_tags AS bad_rows FROM resource_tags GROUP BY resource_id,puppet_tag_id HAVING count(*) > 1 - ) AS good_rows - ON + ) AS good_rows + ON good_rows.resource_id = bad_rows.resource_id AND good_rows.puppet_tag_id = bad_rows.puppet_tag_id AND good_rows.max_id <> bad_rows.id; -- rewrite resource_tags that points to duplicated puppet_tags -- to point to the highest puppet_tags id. -UPDATE - resource_tags v +UPDATE + resource_tags v INNER JOIN puppet_tags n ON n.id = v.puppet_tag_id @@ -104,8 +104,8 @@ FROM puppet_tags AS bad_rows FROM puppet_tags GROUP BY name HAVING count(*) > 1 - ) AS good_rows - ON + ) AS good_rows + ON good_rows.name = bad_rows.name AND good_rows.max_id <> bad_rows.id; diff --git a/ext/emacs/puppet-mode.el b/ext/emacs/puppet-mode.el index 27f4c701a..31249a593 100644 --- a/ext/emacs/puppet-mode.el +++ b/ext/emacs/puppet-mode.el @@ -1,6 +1,6 @@ ;;; ;;; puppet-mode.el -;;; +;;; ;;; Author: lutter ;;; Author: Russ Allbery <rra@stanford.edu> ;;; @@ -152,23 +152,23 @@ of the initial include plus puppet-include-indent." ;; Indent the line to the same indentation as the first ;; element in that array. That is, this... ;; - ;; exec { + ;; exec { ;; "add_puppetmaster_mongrel_startup_links": ;; command => "string1", - ;; creates => [ "string2", "string3", - ;; "string4", "string5", + ;; creates => [ "string2", "string3", + ;; "string4", "string5", ;; "string6", "string7", ;; "string3" ], ;; refreshonly => true, ;; } - ;; + ;; ;; ...should instead look like this: ;; - ;; exec { + ;; exec { ;; "add_puppetmaster_mongrel_startup_links": ;; command => "string1", - ;; creates => [ "string2", "string3", - ;; "string4", "string5", + ;; creates => [ "string2", "string3", + ;; "string4", "string5", ;; "string6", "string7", ;; "string8" ], ;; refreshonly => true, @@ -216,12 +216,12 @@ of the initial include plus puppet-include-indent." ;; if there is more than one block opened and closed on the same ;; line but it's still unbalanced; hopefully people don't do that. ((looking-at "^.*{[^\n}]*$") - (setq cur-indent (+ (current-indentation) puppet-indent-level)) + (setq cur-indent (+ (current-indentation) puppet-indent-level)) (setq not-indented nil)) ;; Indent by one level if the line ends with an open paren. ((looking-at "^.*\(\\s-*$") - (setq cur-indent (+ (current-indentation) puppet-indent-level)) + (setq cur-indent (+ (current-indentation) puppet-indent-level)) (setq not-indented nil)) ;; Semicolon ends a block for a resource when multiple resources diff --git a/ext/puppet-test b/ext/puppet-test index bf6c2de39..dbbde40c6 100755 --- a/ext/puppet-test +++ b/ext/puppet-test @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# == Synopsis +# == Synopsis # # Test individual client performance. Can compile configurations, describe # files, or retrieve files. @@ -309,7 +309,7 @@ Suite.new :rails, "Rails Interactions" do Puppet::Rails.init @facts = Facter.to_hash - if num = ENV["RESOURCECOUNT"] + if num = ENV["RESOURCECOUNT"] @resources = Integer(num) else @resources = 10 diff --git a/ext/puppetlisten/puppetlisten.rb b/ext/puppetlisten/puppetlisten.rb index 23c2c4942..23e9f65d5 100755 --- a/ext/puppetlisten/puppetlisten.rb +++ b/ext/puppetlisten/puppetlisten.rb @@ -46,7 +46,7 @@ File.open(Puppet[:authconfig]).each do |line| end # be a daemon -sock = TCPServer.new(port) +sock = TCPServer.new(port) ssls = OpenSSL::SSL::SSLServer.new(sock, ctx) loop do diff --git a/ext/rack/README b/ext/rack/README index 33f958e36..63b8fde7a 100644 --- a/ext/rack/README +++ b/ext/rack/README @@ -2,7 +2,7 @@ PUPPETMASTER AS A RACK APPLICATION ================================== -puppetmaster can now be hosted as a standard Rack application. A proper +puppetmaster can now be hosted as a standard Rack application. A proper config.ru is provided for this. For more details about rack, see http://rack.rubyforge.org/ . @@ -17,14 +17,14 @@ to work. WEBrick ------- -WEBrick is currently not supported as a Rack host. You'll be better off +WEBrick is currently not supported as a Rack host. You'll be better off just running puppetmasterd directly. Mongrel ------- -If you like Mongrel, and want to replicate wiki:UsingMongrel, you could +If you like Mongrel, and want to replicate wiki:UsingMongrel, you could probably start your backend mongrels this way: cd ext/rack @@ -48,7 +48,7 @@ Requirements: Apache 2.x SSL Module loaded -Apache configuration snippet is in files/apache2.conf. You need to +Apache configuration snippet is in files/apache2.conf. You need to edit it to reflect your servername. Required puppet.conf settings: @@ -60,8 +60,8 @@ To set up most of the boring stuff, you can use this command: puppet --verbose --modulepath ./ext ext/rack/manifest.pp Or use manifest.pp as a starting point for your own module. -Note: Passenger will not let applications run as root or the Apache user, -instead an implicit setuid will be done, to the user whom owns +Note: Passenger will not let applications run as root or the Apache user, +instead an implicit setuid will be done, to the user whom owns config.ru. Therefore, config.ru shall be owned by the puppet user. diff --git a/ext/rack/manifest.pp b/ext/rack/manifest.pp index 5145e05c8..7df07c0c8 100644 --- a/ext/rack/manifest.pp +++ b/ext/rack/manifest.pp @@ -30,7 +30,7 @@ package { ["rack", "passenger"]: service { "apache2": } -case $lsbdistid { +case $lsbdistid { "Debian": { package { ["apache2-mpm-worker", "apache2-threaded-dev", "apache2"]: ensure => installed, diff --git a/ext/vim/syntax/puppet.vim b/ext/vim/syntax/puppet.vim index ba9ac92e9..a60a77bfd 100644 --- a/ext/vim/syntax/puppet.vim +++ b/ext/vim/syntax/puppet.vim @@ -2,9 +2,9 @@ " Filename: puppet.vim " Language: puppet configuration file " Maintainer: Luke Kanies <luke@madstop.com> -" URL: -" Last Change: -" Version: +" URL: +" Last Change: +" Version: " " Copied from the cfengine, ruby, and perl syntax files |