Merge pull request #11 from crayfishx/master

(#15462) Redhat/CentOS support and replacement of inetd with xinetd.

3 files changed, 280 insertions, 122 deletions

diff --git a/spec/classes/tftp_spec.rb b/spec/classes/tftp_spec.rb
index 016130d..21e6f72 100644
--- a/spec/classes/tftp_spec.rb
+++ b/spec/classes/tftp_spec.rb
@@ -2,70 +2,205 @@ require 'spec_helper'
 describe 'tftp', :type => :class do
 
   describe 'when deploying on debian' do
-    let(:facts) { { :operatingsystem => 'Debian',
-                    :path            => '/usr/local/bin:/usr/bin:/bin', } }
-
-    it { should contain_file('/etc/default/tftpd-hpa') }
-    it { should contain_package('tftpd-hpa') }
-    it { should contain_service('tftpd-hpa').with({
-      'ensure'    => 'running',
-      'enable'    => true,
-      'hasstatus' => false,
-      'provider'  => nil,
-    }) }
+    let(:facts) { { :operatingsystem  => 'Debian',
+                    :osfamily         => 'Debian',
+                    :path             => '/usr/local/bin:/usr/bin:/bin', } }
+
+    it {
+      should contain_file('/etc/default/tftpd-hpa')
+      should contain_package('tftpd-hpa')
+      should contain_service('tftpd-hpa').with({
+       'ensure'    => 'running',
+       'enable'    => true,
+       'hasstatus' => false,
+       'provider'  => nil,
+      })
+    }
   end
 
   describe 'when deploying on ubuntu' do
-    let(:facts) { { :operatingsystem => 'Ubuntu',
-                    :path            => '/usr/local/bin:/usr/bin:/bin', } }
-
-    it { should contain_package('tftpd-hpa') }
-    it { should contain_file('/etc/default/tftpd-hpa') }
-    it { should contain_service('tftpd-hpa').with({
-      'ensure'    => 'running',
-      'enable'    => true,
-      'hasstatus' => true,
-      'provider'  => 'upstart',
-    }) }
+    let(:facts) { { :operatingsystem  => 'Ubuntu',
+                    :osfamily         => 'Debian',
+                    :path             => '/usr/local/bin:/usr/bin:/bin', } }
+
+    it {
+      should contain_package('tftpd-hpa')
+      should contain_file('/etc/default/tftpd-hpa')
+      should contain_service('tftpd-hpa').with({
+        'ensure'    => 'running',
+       'enable'    => true,
+       'hasstatus' => true,
+       'provider'  => 'upstart',
+      })
+    }
+  end
+
+  describe 'when deploying on redhat family' do
+    let (:facts) { {  :osfamily         => 'RedHat',
+                      :path             => '/usr/local/bin:/usr/bin:/bin', } }
+
+    it {
+      should contain_package('tftpd-hpa').with({
+        'name'      => 'tftp-server',
+    })
+
+      should contain_service('tftpd-hpa').with({
+       'ensure'    => 'running',
+       'enable'    => 'true',
+       'hasstatus' => false,
+       'provider'  => 'base',
+       'start'     => '/usr/sbin/in.tftpd -l -a 0.0.0.0:69 -u nobody --secure /var/lib/tftpboot',
+      })
+    }
+  end
+
+  describe 'when deploying on redhat family with custom options' do
+    let (:facts) { {  :osfamily         => 'RedHat',
+                      :path             => '/usr/local/bin:/usr/bin:/bin', } }
+    let (:params) { { :address          => '127.0.0.1',
+                      :port             => '1069',
+                      :username         => 'root',
+                      :options          => '--secure --timeout 50',
+                      :directory        => '/tftpboot', } }
+
+    it {
+      should contain_package('tftpd-hpa').with({
+        'name'      => 'tftp-server',
+      })
+
+      should contain_service('tftpd-hpa').with({
+        'ensure'    => 'running',
+        'enable'    => 'true',
+        'hasstatus' => false,
+        'provider'  => 'base',
+        'start'     => '/usr/sbin/in.tftpd -l -a 127.0.0.1:1069 -u root --secure --timeout 50 /tftpboot',
+      })
+    }
+  end
+
+  describe 'when deploying with xinetd on redhat family' do
+    let (:facts) { {  :osfamily => 'Redhat',
+                      :path     => '/usr/local/bin:/usr/bin:/bin', } }
+    let (:params) { { :inetd    => true, } }
+    it {
+      should include_class('xinetd')
+      should contain_service('tftpd-hpa').with({
+        'ensure'      => 'stopped',
+        'enable'      => false,
+    })
+      should contain_xinetd__service('tftp').with({
+        'port'        => '69',
+        'protocol'    => 'udp',
+        'server_args' => '--secure /var/lib/tftpboot',
+        'server'      => '/usr/sbin/in.tftpd',
+        'user'        => 'nobody',
+        'socket_type' => 'dgram',
+        'cps'         => '100 2',
+        'flags'       => 'IPv4',
+        'per_source'   => '11',
+        'wait'        => 'yes',
+      })
+    }
   end
 
-  describe 'when deploying with inetd' do
-    let(:facts) { { :operatingsystem => 'Debian',
-                    :path            => '/usr/local/bin:/usr/bin:/bin', } }
-    let(:params) { { :inetd => true, } }
-
-    it { should contain_package('tftpd-hpa') }
-    it { should contain_file('/etc/default/tftpd-hpa') }
-    it { should contain_class('inetd') }
-    it { should contain_augeas('inetd_tftp').with({
-      'changes' => [
-        "ins tftp after /files/etc/inetd.conf",
-        "set /files/etc/inetd.conf/tftp/socket dgram",
-        "set /files/etc/inetd.conf/tftp/protocol udp",
-        "set /files/etc/inetd.conf/tftp/wait wait",
-        "set /files/etc/inetd.conf/tftp/user tftp",
-        "set /files/etc/inetd.conf/tftp/command /usr/libexec/tftpd",
-        "set /files/etc/inetd.conf/tftp/arguments/1 tftpd",
-        "set /files/etc/inetd.conf/tftp/arguments/2 --address",
-        "set /files/etc/inetd.conf/tftp/arguments/3 0.0.0.0:69",
-        "set /files/etc/inetd.conf/tftp/arguments/4 --secure",
-        "set /files/etc/inetd.conf/tftp/arguments/5 /srv/tftp",
-      ],
-    }) }
-    it { should contain_service('tftpd-hpa').with({
-      'ensure'    => 'stopped',
-      'enable'    => false,
-      'hasstatus' => false,
-      'provider'  => nil,
-    }) }
+  describe 'when deploying with xinetd on ubuntu' do
+    let (:facts) { {  :osfamily         => 'Debian',
+                      :operatingsystem  => 'Ubuntu',
+                      :path     => '/usr/local/bin:/usr/bin:/bin', } }
+    let (:params) { { :inetd    => true, } }
+    it {
+      should include_class('xinetd')
+      should contain_service('tftpd-hpa').with({
+        'ensure'      => 'stopped',
+        'enable'      => false,
+      })
+      should contain_xinetd__service('tftp').with({
+        'port'        => '69',
+        'protocol'    => 'udp',
+        'server_args' => '--secure /var/lib/tftpboot',
+        'server'      => '/usr/sbin/in.tftpd',
+        'user'        => 'tftp',
+        'socket_type' => 'dgram',
+        'cps'         => '100 2',
+        'flags'       => 'IPv4',
+        'per_source'   => '11',
+        'wait'        => 'yes',
+      })
+    }
   end
 
-  describe 'when deploying with inetd and custom options' do
-    let(:facts) { { :operatingsystem => 'Debian',
-                    :path            => '/usr/local/bin:/usr/bin:/bin', } }
-    let(:params) { { :inetd          => true,
-                     :options        => '--timeout 5 --secure', } }
+  describe 'when deploying with xinetd on debian' do
+    let (:facts) { {  :osfamily         => 'Debian',
+                      :operatingsystem  => 'Debian',
+                      :path     => '/usr/local/bin:/usr/bin:/bin', } }
+    let (:params) { { :inetd    => true, } }
+    it {
+      should include_class('xinetd')
+      should contain_xinetd__service('tftp').with({
+        'port'        => '69',
+        'protocol'    => 'udp',
+        'server_args' => '--secure /srv/tftp',
+        'server'      => '/usr/sbin/in.tftpd',
+        'user'        => 'tftp',
+        'socket_type' => 'dgram',
+        'cps'         => '100 2',
+        'flags'       => 'IPv4',
+        'per_source'  => '11',
+        'wait'        => 'yes',
+        'bind'        => '0.0.0.0',
+      })
+    }
+  end
+
+  describe 'when deploying with xinetd with custom options' do
+    let (:facts) { {  :osfamily         => 'Debian',
+                      :operatingsystem  => 'Debian',
+                      :path     => '/usr/local/bin:/usr/bin:/bin', } }
+    let (:params) { { :inetd    => true,
+                      :options  => '--secure --timeout 50', } }
+    it {
+      should include_class('xinetd')
+      should contain_xinetd__service('tftp').with({
+        'port'        => '69',
+        'protocol'    => 'udp',
+        'server_args' => '--secure --timeout 50 /srv/tftp',
+        'server'      => '/usr/sbin/in.tftpd',
+        'user'        => 'tftp',
+        'socket_type' => 'dgram',
+        'cps'         => '100 2',
+        'flags'       => 'IPv4',
+        'per_source'  => '11',
+        'wait'        => 'yes',
+        'bind'        => '0.0.0.0',
+      })
+    }
+  end
 
-   it { expect { should contain_class('tftp') }.to raise_error(Puppet::Error) }
+  describe 'when deploying with xinetd with custom settings' do
+    let (:facts) { {  :osfamily         => 'Debian',
+                      :operatingsystem  => 'Debian',
+                      :path       => '/usr/local/bin:/usr/bin:/bin', } }
+    let (:params) { { :inetd      => true,
+                      :port       => 1069,
+                      :address    => '127.0.0.1',
+                      :username   => 'root',
+                      :directory  => '/tftpboot', } }
+    it {
+      should include_class('xinetd')
+      should contain_xinetd__service('tftp').with({
+        'port'        => '1069',
+        'protocol'    => 'udp',
+        'server_args' => '--secure /tftpboot',
+        'server'      => '/usr/sbin/in.tftpd',
+        'user'        => 'root',
+        'socket_type' => 'dgram',
+        'cps'         => '100 2',
+        'flags'       => 'IPv4',
+        'per_source'   => '11',
+        'wait'        => 'yes',
+        'bind'        => '127.0.0.1',
+      })
+    }
   end
+
 end
diff --git a/spec/defines/tftp_file_spec.rb b/spec/defines/tftp_file_spec.rb
index 0de1b6f..e24f0f3 100644
--- a/spec/defines/tftp_file_spec.rb
+++ b/spec/defines/tftp_file_spec.rb
@@ -6,30 +6,36 @@ describe 'tftp::file' do
 
   describe 'when deploying on debian' do
     let(:facts) { { :operatingsystem => 'Debian',
+                    :osfamily        => 'Debian',
                     :path            => '/usr/local/bin:/usr/bin:/bin', } }
 
-    it { should include_class('tftp') }
-    it { should contain_file('/srv/tftp/sample').with({
-      'ensure'  => 'file',
-      'owner'   => 'tftp',
-      'group'   => 'tftp',
-      'mode'    => '0644',
-      'recurse' => false,
-    }) }
+    it {
+      should include_class('tftp')
+      should contain_file('/srv/tftp/sample').with({
+        'ensure'  => 'file',
+        'owner'   => 'tftp',
+        'group'   => 'tftp',
+        'mode'    => '0644',
+        'recurse' => false,
+      })
+    }
   end
 
   describe 'when deploying on ubuntu' do
     let(:facts) { { :operatingsystem => 'ubuntu',
+                    :osfamily        => 'Debian',
                     :path            => '/usr/local/bin:/usr/bin:/bin', } }
 
-    it { should include_class('tftp') }
-    it { should contain_file('/var/lib/tftpboot/sample').with({
-      'ensure'  => 'file',
-      'owner'   => 'tftp',
-      'group'   => 'tftp',
-      'mode'    => '0644',
-      'recurse' => false,
-    }) }
+    it {
+      should include_class('tftp')
+      should contain_file('/var/lib/tftpboot/sample').with({
+        'ensure'  => 'file',
+        'owner'   => 'tftp',
+        'group'   => 'tftp',
+        'mode'    => '0644',
+        'recurse' => false,
+      })
+    }
   end
 
   describe 'when deploying with parameters' do
@@ -39,30 +45,36 @@ describe 'tftp::file' do
                     :mode   => '0755',
                     :recurse => true }}
     let(:facts) { { :operatingsystem => 'Debian',
+                    :osfamily        => 'Debian',
                     :path            => '/usr/local/bin:/usr/bin:/bin', } }
 
-    it { should include_class('tftp') }
-    it { should contain_file('/srv/tftp/sample').with({
-      'ensure'  => 'directory',
-      'owner'   => 'root',
-      'group'   => 'root',
-      'mode'    => '0755',
-      'recurse' => true,
-    }) }
+    it {
+      should include_class('tftp')
+      should contain_file('/srv/tftp/sample').with({
+        'ensure'  => 'directory',
+        'owner'   => 'root',
+        'group'   => 'root',
+        'mode'    => '0755',
+        'recurse' => true,
+      })
+    }
   end
 
   describe 'when deploying without recurse parameters' do
     let(:facts) { {:operatingsystem => 'Debian',
+                   :osfamily        => 'Debian',
                    :path            => '/usr/local/bin:/usr/bin:/bin', } }
 
-    it { should include_class('tftp') }
-    it { should contain_file('/srv/tftp/sample').with({
-      'ensure'       => 'file',
-      'recurse'      => false,
-      'purge'        => nil,
-      'replace'      => nil,
-      'recurselimit' => nil,
-    }) }
+    it {
+      should include_class('tftp')
+      should contain_file('/srv/tftp/sample').with({
+        'ensure'       => 'file',
+        'recurse'      => false,
+        'purge'        => nil,
+        'replace'      => nil,
+        'recurselimit' => nil,
+      })
+    }
   end
 
   describe 'when deploying with recurse parameters' do
@@ -73,49 +85,57 @@ describe 'tftp::file' do
                     :purge        => true,
                     :replace      => false }}
     let(:facts) { {:operatingsystem => 'Debian',
+                   :osfamily        => 'Debian',
                    :path            => '/usr/local/bin:/usr/bin:/bin', }}
 
-    it { should include_class('tftp') }
-    it { should contain_file('/srv/tftp/sample').with({
-      'ensure'       => 'directory',
-      'owner'        => 'tftp',
-      'group'        => 'tftp',
-      'mode'         => '0755',
-      'recurse'      => true,
-      'recurselimit' => 42,
-      'purge'        => true,
-      'replace'      => false,
-    }) }
+    it {
+      should include_class('tftp')
+      should contain_file('/srv/tftp/sample').with({
+        'ensure'       => 'directory',
+        'owner'        => 'tftp',
+        'group'        => 'tftp',
+        'mode'         => '0755',
+        'recurse'      => true,
+        'recurselimit' => 42,
+        'purge'        => true,
+        'replace'      => false,
+      })
+    }
   end
 
   describe 'when deploying directory' do
     let(:params) { {:ensure => 'directory',
                     :mode   => '0755' }}
     let(:facts) { { :operatingsystem    => 'Debian',
+                    :osfamily           => 'Debian',
                     :caller_module_name => 'acme',
                     :path               => '/usr/local/bin:/usr/bin:/bin', } }
 
-    it { should include_class('tftp') }
-    it { should contain_file('/srv/tftp/sample').with({
-      'ensure' => 'directory',
-      'mode'   => '0755',
-      'source' => nil,
-    }) }
+    it {
+      should include_class('tftp')
+      should contain_file('/srv/tftp/sample').with({
+        'ensure' => 'directory',
+        'mode'   => '0755',
+        'source' => nil,
+      })
+    }
   end
 
-  describe 'when deploying file from another module' do
+  describe 'when deploying file' do
     let(:params) { {:ensure => 'file',
                     :mode   => '0755' }}
     let(:facts) { { :operatingsystem    => 'Debian',
-                    :caller_module_name => 'acme',
+                    :osfamily           => 'Debian',
                     :path               => '/usr/local/bin:/usr/bin:/bin', } }
 
-    it { should include_class('tftp') }
-    it { should contain_file('/srv/tftp/sample').with({
-      'ensure' => 'file',
-      'mode'   => '0755',
-      'source' => 'puppet:///modules/acme/sample'
-    }) }
+    it {
+      should include_class('tftp')
+      should contain_file('/srv/tftp/sample').with({
+        'ensure' => 'file',
+        'mode'   => '0755',
+        'source' => 'puppet:///modules/tftp/sample'
+      })
+    }
   end
 
   describe 'when deploying file with content' do
@@ -123,15 +143,18 @@ describe 'tftp::file' do
                     :content => 'hi',
                     :mode    => '0755' }}
     let(:facts) { { :operatingsystem    => 'Debian',
+                    :osfamily           => 'Debian',
                     :caller_module_name => 'acme',
                     :path               => '/usr/local/bin:/usr/bin:/bin', } }
-
-    it { should include_class('tftp') }
-    it { should contain_file('/srv/tftp/sample').with({
-      'ensure'  => 'file',
-      'mode'    => '0755',
-      'content' => 'hi',
-      'source'  => nil,
-    }) }
+    it {
+      should include_class('tftp')
+      should contain_file('/srv/tftp/sample').with({
+        'ensure'  => 'file',
+        'mode'    => '0755',
+        'content' => 'hi',
+        'source'  => nil,
+      })
+    }
   end
+
 end
diff --git a/spec/fixtures/manifests/site.pp b/spec/fixtures/manifests/site.pp
deleted file mode 100644
index e69de29..0000000
--- a/spec/fixtures/manifests/site.pp
+++ /dev/null