diff options
Diffstat (limited to 'lib/puppet/type/file/mode.rb')
| -rwxr-xr-x | lib/puppet/type/file/mode.rb | 216 |
1 files changed, 108 insertions, 108 deletions
diff --git a/lib/puppet/type/file/mode.rb b/lib/puppet/type/file/mode.rb index 31209f42e..9abf56d26 100755 --- a/lib/puppet/type/file/mode.rb +++ b/lib/puppet/type/file/mode.rb @@ -2,123 +2,123 @@ # for specification (e.g., u+rwx, or -0011), but for now only supports # specifying the full mode. module Puppet - Puppet::Type.type(:file).newproperty(:mode) do - require 'etc' - desc "Mode the file should be. Currently relatively limited: - you must specify the exact mode the file should be. - - Note that when you set the mode of a directory, Puppet always - sets the search/traverse (1) bit anywhere the read (4) bit is set. - This is almost always what you want: read allows you to list the - entries in a directory, and search/traverse allows you to access - (read/write/execute) those entries.) Because of this feature, you - can recursively make a directory and all of the files in it - world-readable by setting e.g.:: - - file { '/some/dir': - mode => 644, - recurse => true, - } - - In this case all of the files underneath ``/some/dir`` will have - mode 644, and all of the directories will have mode 755." - - @event = :file_changed - - # Our modes are octal, so make sure they print correctly. Other - # valid values are symbols, basically - def is_to_s(currentvalue) - case currentvalue - when Integer - return "%o" % currentvalue - when Symbol - return currentvalue - else - raise Puppet::DevError, "Invalid current value for mode: #{currentvalue.inspect}" - end - end + Puppet::Type.type(:file).newproperty(:mode) do + require 'etc' + desc "Mode the file should be. Currently relatively limited: + you must specify the exact mode the file should be. + + Note that when you set the mode of a directory, Puppet always + sets the search/traverse (1) bit anywhere the read (4) bit is set. + This is almost always what you want: read allows you to list the + entries in a directory, and search/traverse allows you to access + (read/write/execute) those entries.) Because of this feature, you + can recursively make a directory and all of the files in it + world-readable by setting e.g.:: + + file { '/some/dir': + mode => 644, + recurse => true, + } + + In this case all of the files underneath ``/some/dir`` will have + mode 644, and all of the directories will have mode 755." + + @event = :file_changed + + # Our modes are octal, so make sure they print correctly. Other + # valid values are symbols, basically + def is_to_s(currentvalue) + case currentvalue + when Integer + return "%o" % currentvalue + when Symbol + return currentvalue + else + raise Puppet::DevError, "Invalid current value for mode: #{currentvalue.inspect}" + end + end - def should_to_s(newvalue = @should) - case newvalue - when Integer - return "%o" % newvalue - when Symbol - return newvalue - else - raise Puppet::DevError, "Invalid 'should' value for mode: #{newvalue.inspect}" - end - end + def should_to_s(newvalue = @should) + case newvalue + when Integer + return "%o" % newvalue + when Symbol + return newvalue + else + raise Puppet::DevError, "Invalid 'should' value for mode: #{newvalue.inspect}" + end + end - munge do |should| - # this is pretty hackish, but i need to make sure the number is in - # octal, yet the number can only be specified as a string right now - value = should - if value.is_a?(String) - unless value =~ /^\d+$/ - raise Puppet::Error, "File modes can only be numbers, not #{value.inspect}" - end - # Make sure our number looks like octal. - unless value =~ /^0/ - value = "0#{value}" - end - old = value - begin - value = Integer(value) - rescue ArgumentError => detail - raise Puppet::DevError, "Could not convert #{old.inspect} to integer" - end - end - - return value + munge do |should| + # this is pretty hackish, but i need to make sure the number is in + # octal, yet the number can only be specified as a string right now + value = should + if value.is_a?(String) + unless value =~ /^\d+$/ + raise Puppet::Error, "File modes can only be numbers, not #{value.inspect}" end + # Make sure our number looks like octal. + unless value =~ /^0/ + value = "0#{value}" + end + old = value + begin + value = Integer(value) + rescue ArgumentError => detail + raise Puppet::DevError, "Could not convert #{old.inspect} to integer" + end + end - # If we're a directory, we need to be executable for all cases - # that are readable. This should probably be selectable, but eh. - def dirmask(value) - if FileTest.directory?(@resource[:path]) - value |= 0100 if value & 0400 != 0 - value |= 010 if value & 040 != 0 - value |= 01 if value & 04 != 0 - end + return value + end - value - end + # If we're a directory, we need to be executable for all cases + # that are readable. This should probably be selectable, but eh. + def dirmask(value) + if FileTest.directory?(@resource[:path]) + value |= 0100 if value & 0400 != 0 + value |= 010 if value & 040 != 0 + value |= 01 if value & 04 != 0 + end - def insync?(currentvalue) - if stat = @resource.stat and stat.ftype == "link" and @resource[:links] != :follow - self.debug "Not managing symlink mode" - return true - else - return super(currentvalue) - end - end + value + end - def retrieve - # If we're not following links and we're a link, then we just turn - # off mode management entirely. - - if stat = @resource.stat(false) - unless defined?(@fixed) - @should &&= @should.collect { |s| self.dirmask(s) } - end - return stat.mode & 007777 - else - return :absent - end - end + def insync?(currentvalue) + if stat = @resource.stat and stat.ftype == "link" and @resource[:links] != :follow + self.debug "Not managing symlink mode" + return true + else + return super(currentvalue) + end + end - def sync - mode = self.should - - begin - File.chmod(mode, @resource[:path]) - rescue => detail - error = Puppet::Error.new("failed to chmod #{@resource[:path]}: #{detail.message}") - error.set_backtrace detail.backtrace - raise error - end - :file_changed + def retrieve + # If we're not following links and we're a link, then we just turn + # off mode management entirely. + + if stat = @resource.stat(false) + unless defined?(@fixed) + @should &&= @should.collect { |s| self.dirmask(s) } end + return stat.mode & 007777 + else + return :absent + end + end + + def sync + mode = self.should + + begin + File.chmod(mode, @resource[:path]) + rescue => detail + error = Puppet::Error.new("failed to chmod #{@resource[:path]}: #{detail.message}") + error.set_backtrace detail.backtrace + raise error + end + :file_changed end + end end |