diff options
| author | Nan Liu <nan@puppetlabs.com> | 2012-08-20 10:21:25 -0700 |
|---|---|---|
| committer | Nan Liu <nan@puppetlabs.com> | 2012-08-20 10:21:25 -0700 |
| commit | ec833cbffc337c6733349061585ce532e4040991 (patch) | |
| tree | 286b83b4b7ef7e21ce699baae8935ff1dff35a96 | |
| parent | 634aad0477bb3480270bc8beaaf8252bc06fcb77 (diff) | |
| download | puppet-tftp-ec833cbffc337c6733349061585ce532e4040991.tar.gz puppet-tftp-ec833cbffc337c6733349061585ce532e4040991.tar.bz2 | |
Update tftp xinetd fix.
* Remove xinetd defaults for user/group.
* Fix spec tests.
| -rw-r--r-- | manifests/init.pp | 2 | ||||
| -rw-r--r-- | spec/classes/tftp_spec.rb | 15 |
2 files changed, 5 insertions, 12 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index f91763e..300824d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -60,8 +60,6 @@ class tftp ( protocol => 'udp', server_args => "${options} -u ${username} ${directory}", server => $binary, - user => 'root', - group => 'root', bind => $address, socket_type => 'dgram', cps => '100 2', diff --git a/spec/classes/tftp_spec.rb b/spec/classes/tftp_spec.rb index 872a82d..948f86d 100644 --- a/spec/classes/tftp_spec.rb +++ b/spec/classes/tftp_spec.rb @@ -91,9 +91,8 @@ describe 'tftp', :type => :class do should contain_xinetd__service('tftp').with({ 'port' => '69', 'protocol' => 'udp', - 'server_args' => '--secure /var/lib/tftpboot', + 'server_args' => '--secure -u nobody /var/lib/tftpboot', 'server' => '/usr/sbin/in.tftpd', - 'user' => 'nobody', 'socket_type' => 'dgram', 'cps' => '100 2', 'flags' => 'IPv4', @@ -116,9 +115,8 @@ describe 'tftp', :type => :class do should contain_xinetd__service('tftp').with({ 'port' => '69', 'protocol' => 'udp', - 'server_args' => '--secure /var/lib/tftpboot', + 'server_args' => '--secure -u tftp /var/lib/tftpboot', 'server' => '/usr/sbin/in.tftpd', - 'user' => 'tftp', 'socket_type' => 'dgram', 'cps' => '100 2', 'flags' => 'IPv4', @@ -137,9 +135,8 @@ describe 'tftp', :type => :class do should contain_xinetd__service('tftp').with({ 'port' => '69', 'protocol' => 'udp', - 'server_args' => '--secure /srv/tftp', + 'server_args' => '--secure -u tftp /srv/tftp', 'server' => '/usr/sbin/in.tftpd', - 'user' => 'tftp', 'socket_type' => 'dgram', 'cps' => '100 2', 'flags' => 'IPv4', @@ -160,9 +157,8 @@ describe 'tftp', :type => :class do should contain_xinetd__service('tftp').with({ 'port' => '69', 'protocol' => 'udp', - 'server_args' => '--secure --timeout 50 /srv/tftp', + 'server_args' => '--secure --timeout 50 -u tftp /srv/tftp', 'server' => '/usr/sbin/in.tftpd', - 'user' => 'tftp', 'socket_type' => 'dgram', 'cps' => '100 2', 'flags' => 'IPv4', @@ -186,9 +182,8 @@ describe 'tftp', :type => :class do should contain_xinetd__service('tftp').with({ 'port' => '1069', 'protocol' => 'udp', - 'server_args' => '--secure /tftpboot', + 'server_args' => '--secure -u root /tftpboot', 'server' => '/usr/sbin/in.tftpd', - 'user' => 'root', 'socket_type' => 'dgram', 'cps' => '100 2', 'flags' => 'IPv4', |