From e6fdb02216705fc99555b1cf93d069ac192ef10d Mon Sep 17 00:00:00 2001 From: James McKenzie Date: Thu, 1 Aug 2024 08:06:27 +0100 Subject: [PATCH] Re-apply commit 2faa817dcb05821bd9c27bbe8bf1955e6b2442f2 eliminate params.pp and create_resources() params.pp and create_resources() are obsolete. This module was converted to non-params.pp style #667, but was reverted in #680. Using Hiera in modules and no params.pp are the preferred styles these days. --- manifests/params.pp | 111 -------------------------------------------- 1 file changed, 111 deletions(-) delete mode 100644 manifests/params.pp diff --git a/manifests/params.pp b/manifests/params.pp deleted file mode 100644 index 22f2af4e29..0000000000 --- a/manifests/params.pp +++ /dev/null @@ -1,111 +0,0 @@ -# @summary Provides defaults for the Apt module parameters. -# -# @api private -# -class apt::params { - if $facts['os']['family'] != 'Debian' { - fail('This module only works on Debian or derivatives like Ubuntu') - } - - $root = '/etc/apt' - $provider = '/usr/bin/apt-get' - $sources_list = "${root}/sources.list" - $sources_list_force = false - $sources_list_d = "${root}/sources.list.d" - $trusted_gpg_d = "${root}/trusted.gpg.d" - $conf_d = "${root}/apt.conf.d" - $preferences = "${root}/preferences" - $preferences_d = "${root}/preferences.d" - $apt_conf_d = "${root}/apt.conf.d" - $keyserver = 'keyserver.ubuntu.com' - $key_options = undef - $confs = {} - $update = {} - $purge = {} - $proxy = {} - $sources = {} - $keys = {} - $ppas = {} - $pins = {} - $settings = {} - $manage_auth_conf = true - $auth_conf_entries = [] - - $config_files = { - 'conf' => { - 'path' => $conf_d, - 'ext' => '', - }, - 'pref' => { - 'path' => $preferences_d, - 'ext' => '.pref', - }, - 'list' => { - 'path' => $sources_list_d, - 'ext' => '.list', - }, - 'sources' => { - 'path' => $sources_list_d, - 'ext' => '.sources', - }, - } - - $update_defaults = { - 'frequency' => 'reluctantly', - 'loglevel' => undef, - 'timeout' => undef, - 'tries' => undef, - } - - $proxy_defaults = { - 'ensure' => undef, - 'host' => undef, - 'port' => 8080, - 'https' => false, - 'https_acng' => false, - 'direct' => false, - } - - $purge_defaults = { - 'sources.list' => false, - 'sources.list.d' => false, - 'preferences' => false, - 'preferences.d' => false, - 'apt.conf.d' => false, - } - - $include_defaults = { - 'deb' => true, - 'src' => false, - } - - case $facts['os']['name'] { - 'Debian': { - $backports = { - 'location' => 'http://deb.debian.org/debian', - 'repos' => 'main contrib non-free', - } - $ppa_options = undef - $ppa_package = undef - $auth_conf_owner = '_apt' - } - 'Ubuntu': { - $backports = { - 'location' => 'http://archive.ubuntu.com/ubuntu', - 'repos' => 'main universe multiverse restricted', - } - $ppa_options = ['-y'] - $ppa_package = 'software-properties-common' - $auth_conf_owner = '_apt' - } - undef: { - fail('Unable to determine value for fact os[\"name\"]') - } - default: { - $ppa_options = undef - $ppa_package = undef - $backports = undef - $auth_conf_owner = 'root' - } - } -}