.fixtures.yml

@@ -2,4 +2,3 @@ fixtures:
   repositories:
     augeas_core: 'https://github.com/puppetlabs/puppetlabs-augeas_core'
     stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib'
-    xinetd: 'https://github.com/puppetlabs/puppetlabs-xinetd'

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 
-## [7.2.0](https://github.com/theforeman/puppet-tftp/tree/7.2.0) (2022-04-19)
+## [8.0.0](https://github.com/theforeman/puppet-tftp/tree/8.0.0) (2022-10-27)
+
+[Full Changelog](https://github.com/theforeman/puppet-tftp/compare/7.2.0...8.0.0)
+
+**Breaking changes:**
+
+- Drop xinetd support [\#136](https://github.com/theforeman/puppet-tftp/pull/136) ([ekohl](https://github.com/ekohl))
+
+**Implemented enhancements:**
+
+- Update to voxpupuli-test 5 [\#135](https://github.com/theforeman/puppet-tftp/pull/135) ([ekohl](https://github.com/ekohl))
+
+## [7.2.0](https://github.com/theforeman/puppet-tftp/tree/7.2.0) (2022-04-20)
 
 [Full Changelog](https://github.com/theforeman/puppet-tftp/compare/7.1.0...7.2.0)
 

Gemfile

@@ -13,7 +13,7 @@ gem 'puppet-lint-param-docs', '>= 1.3.0', {"groups"=>["test"]}
 gem 'puppet-lint-spaceship_operator_without_tag-check', {"groups"=>["test"]}
 gem 'puppet-lint-strict_indent-check', {"groups"=>["test"]}
 gem 'puppet-lint-undef_in_function-check', {"groups"=>["test"]}
-gem 'voxpupuli-test', '~> 1.4', {"groups"=>["test"]}
+gem 'voxpupuli-test', '~> 5.0', {"groups"=>["test"]}
 gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
 gem 'puppet_metadata', '~> 1.3'
 gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}

data/Amazon.yaml

@@ -1,5 +1,5 @@
 ---
-tftp::daemon: false
 tftp::package: tftp-server
 tftp::root: "/var/lib/tftpboot"
+tftp::service: tftp.socket
 tftp::syslinux_package: syslinux

data/Archlinux.yaml

@@ -1,5 +1,4 @@
 ---
-tftp::daemon: true
 tftp::package: tftp-hpa
 tftp::root: "/srv/tftp"
 tftp::service: tftpd.socket

data/Debian.yaml

@@ -1,5 +1,4 @@
 ---
-tftp::daemon: true
 tftp::package: tftpd-hpa
 tftp::root: "/srv/tftp"
 tftp::service: tftpd-hpa

data/DragonFly.yaml

@@ -1,5 +1,4 @@
 ---
-tftp::daemon: true
 tftp::package: tftp-hpa
 tftp::root: "/tftpboot"
 tftp::service: tftpd

data/FreeBSD.yaml

@@ -1,5 +1,4 @@
 ---
-tftp::daemon: true
 tftp::package: tftp-hpa
 tftp::root: "/tftpboot"
 tftp::service: tftpd

data/RedHat.yaml

@@ -1,5 +1,4 @@
 ---
-tftp::daemon: true
 tftp::service: tftp.socket
 tftp::package: tftp-server
 tftp::root: "/var/lib/tftpboot"

data/common.yaml

@@ -1,3 +1,2 @@
 ---
 tftp::manage_root_dir: true
-tftp::map_source: puppet:///modules/tftp/tftpd.map

manifests/config.pp

@@ -2,39 +2,13 @@
 # @api private
 class tftp::config {
   if $tftp::manage_root_dir {
-    ensure_resource('file', $tftp::root, {'ensure' => 'directory'})
+    ensure_resource('file', $tftp::root, { 'ensure' => 'directory' })
   }
 
-  if $tftp::daemon {
-    if $facts['os']['family'] =~ /^(FreeBSD|DragonFly)$/ {
-      augeas { 'set root directory':
-        context => '/files/etc/rc.conf',
-        changes => "set tftpd_flags '\"-s ${tftp::root}\"'",
-      }
-    }
-  } else {
-    include xinetd
-
-    xinetd::service { 'tftp':
-      port        => '69',
-      server      => '/usr/sbin/in.tftpd',
-      server_args => "-v -s ${tftp::root} -m /etc/tftpd.map",
-      socket_type => 'dgram',
-      protocol    => 'udp',
-      cps         => '100 2',
-      flags       => 'IPv4',
-      per_source  => '11',
-    }
-
-    file {'/etc/tftpd.map':
-      source    => $tftp::map_source,
-      mode      => '0644',
-      show_diff => false, # Puppet explodes with 'Error: invalid byte sequence in UTF-8' when trying to display the diff
-      notify    => Class['xinetd'],
-    }
-
-    if $tftp::manage_root_dir {
-      File[$tftp::root] ~> Class['xinetd']
+  if $facts['os']['family'] =~ /^(FreeBSD|DragonFly)$/ {
+    augeas { 'set root directory':
+      context => '/files/etc/rc.conf',
+      changes => "set tftpd_flags '\"-s ${tftp::root}\"'",
     }
   }
 }

manifests/init.pp

@@ -1,8 +1,3 @@
-# TFTP server class
-#
-# This class installs and configures a TFTP server, supporting both standalone
-# daemons and xinetd-based TFTP servers.
-#
 # @summary Installs and configures a TFTP server
 #
 # @example Simple usage
@@ -21,18 +16,14 @@
 # @param root Configures the root directory for the TFTP server
 # @param package Name of the TFTP server package
 # @param syslinux_package Name of the syslinux package, essential for pxe boot
-# @param daemon Runs a TFTP service when true, configures xinetd when false
 # @param manage_root_dir manages the root dir, which tftpd will serve, defaults to true
-# @param map_source The source URL of the mapping file
 # @param service Name of the TFTP service, when daemon is true
 # @param service_provider Override TFTP service provider, when daemon is true
 class tftp (
   Stdlib::Absolutepath $root,
   String $package,
   Variant[String, Array[String]] $syslinux_package,
-  Boolean $daemon,
   Boolean $manage_root_dir,
-  String $map_source,
   Optional[String] $service = undef,
   Optional[String] $service_provider = undef,
 ) {

manifests/service.pp

@@ -1,14 +1,10 @@
 # TFTP service
 # @api private
 class tftp::service {
-
-  # No service needed if not daemonized
-  if $tftp::daemon {
-    service { $tftp::service:
-      ensure   => running,
-      enable   => true,
-      alias    => 'tftpd',
-      provider => $tftp::service_provider,
-    }
+  service { $tftp::service:
+    ensure   => running,
+    enable   => true,
+    alias    => 'tftpd',
+    provider => $tftp::service_provider,
   }
 }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-tftp",
-  "version": "7.2.0",
+  "version": "8.0.0",
   "author": "theforeman",
   "summary": "TFTP server configuration",
   "license": "GPL-3.0+",
@@ -10,17 +10,12 @@
   "description": "Module for configuring a TFTP server",
   "tags": [
     "foreman",
-    "tftp",
-    "xinetd"
+    "tftp"
   ],
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.13.1 < 9.0.0"
-    },
-    {
-      "name": "puppetlabs/xinetd",
-      "version_requirement": ">= 1.1.0 < 4.0.0"
     }
   ],
   "requirements": [

spec/acceptance/tftp_spec.rb

@@ -1,14 +1,6 @@
 require 'spec_helper_acceptance'
 
 describe 'tftp with default parameters' do
-  before(:all) do
-    on hosts, puppet('resource', 'service', 'xinetd', 'ensure=stopped', 'enable=false')
-  end
-
-  after(:all) do
-    on hosts, puppet('resource', 'service', 'xinetd', 'ensure=stopped', 'enable=false')
-  end
-
   it_behaves_like 'an idempotent resource' do
     let(:manifest) do
       <<-PUPPET
@@ -26,7 +18,7 @@ class { 'tftp': }
                  when 'Archlinux'
                    'tftpd.socket'
                  when 'RedHat'
-                   fact('operatingsystemmajrelease').to_i >= 8 ? 'tftp.socket' : 'xinetd'
+                   'tftp.socket'
                  when 'Debian'
                    'tftpd-hpa'
                  end
@@ -36,11 +28,6 @@ class { 'tftp': }
     it { is_expected.to be_running }
   end
 
-  describe service('xinetd'), if: service_name != 'xinetd' do
-    it { is_expected.not_to be_enabled }
-    it { is_expected.not_to be_running }
-  end
-
   describe port(69), unless: service_name.end_with?('.socket') do
     it { is_expected.to be_listening.with('udp') }
   end