Update tftp xinetd fix.

* Remove xinetd defaults for user/group.
* Fix spec tests.

diff --git a/manifests/init.pp b/manifests/init.pp
index f91763e3360f9d7bb7a3c7625203085bba924607..300824dec7f8591cfbbee70f9d3b1c107abaff0f 100644 (file)
--- 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 872a82df2301fa376e7cc4a3a653917769b1dcfe..948f86d9f3e031e0f3e096d83e470f28b759d19c 100644 (file)
--- 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',