summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--manifests/apt_conf.pp12
-rw-r--r--manifests/apticron.pp22
-rw-r--r--manifests/dist_upgrade/initiator.pp2
-rw-r--r--manifests/init.pp28
-rw-r--r--manifests/listchanges.pp15
-rw-r--r--manifests/params.pp18
-rw-r--r--manifests/preferences_snippet.pp10
-rw-r--r--manifests/preseeded_package.pp6
-rw-r--r--manifests/proxy_client.pp6
-rw-r--r--manifests/sources_list.pp2
-rw-r--r--manifests/unattended_upgrades.pp10
-rw-r--r--manifests/upgrade_package.pp2
12 files changed, 68 insertions, 65 deletions
diff --git a/manifests/apt_conf.pp b/manifests/apt_conf.pp
index fa8cfa3..ec6da6d 100644
--- a/manifests/apt_conf.pp
+++ b/manifests/apt_conf.pp
@@ -1,9 +1,9 @@
-define apt::apt_conf(
- $ensure = 'present',
- $source = undef,
- $content = undef,
- $refresh_apt = true )
-{
+define apt::apt_conf (
+ $ensure = 'present',
+ $source = undef,
+ $content = undef,
+ $refresh_apt = true,
+) {
if $source == undef and $content == undef {
fail("One of \$source or \$content must be specified for apt_conf ${name}")
diff --git a/manifests/apticron.pp b/manifests/apticron.pp
index 73ada70..a8a24be 100644
--- a/manifests/apticron.pp
+++ b/manifests/apticron.pp
@@ -1,15 +1,15 @@
-class apt::apticron(
- $ensure_version = 'installed',
- $config = "apt/${::operatingsystem}/apticron.erb",
- $email = 'root',
- $diff_only = '1',
+class apt::apticron (
+ $ensure_version = 'installed',
+ $config = "apt/${::operatingsystem}/apticron.erb",
+ $email = 'root',
+ $diff_only = '1',
$listchanges_profile = 'apticron',
- $system = false,
- $ipaddressnum = false,
- $ipaddresses = false,
- $notifyholds = '0',
- $notifynew = '0',
- $customsubject = ''
+ $system = false,
+ $ipaddressnum = false,
+ $ipaddresses = false,
+ $notifyholds = '0',
+ $notifynew = '0',
+ $customsubject = '',
) {
package { 'apticron':
diff --git a/manifests/dist_upgrade/initiator.pp b/manifests/dist_upgrade/initiator.pp
index d238988..eae5492 100644
--- a/manifests/dist_upgrade/initiator.pp
+++ b/manifests/dist_upgrade/initiator.pp
@@ -1,6 +1,6 @@
class apt::dist_upgrade::initiator inherits apt::dist_upgrade {
- $initiator = 'upgrade_initiator'
+ $initiator = 'upgrade_initiator'
$initiator_abs = "${apt::apt_base_dir}/${initiator}"
file { 'apt_upgrade_initiator':
diff --git a/manifests/init.pp b/manifests/init.pp
index 30782e4..f7ef2e4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,21 +3,21 @@
# Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
# See LICENSE for the full license granted to you.
-class apt(
- $use_lts = $apt::params::use_lts,
- $use_volatile = $apt::params::use_volatile,
- $use_backports = $apt::params::use_backports,
- $include_src = $apt::params::include_src,
- $use_next_release = $apt::params::use_next_release,
- $debian_url = $apt::params::debian_url,
- $security_url = $apt::params::security_url,
- $lts_url = $apt::params::lts_url,
- $volatile_url = $apt::params::volatile_url,
- $ubuntu_url = $apt::params::ubuntu_url,
- $repos = $apt::params::repos,
- $custom_preferences = $apt::params::custom_preferences,
+class apt (
+ $use_lts = $apt::params::use_lts,
+ $use_volatile = $apt::params::use_volatile,
+ $use_backports = $apt::params::use_backports,
+ $include_src = $apt::params::include_src,
+ $use_next_release = $apt::params::use_next_release,
+ $debian_url = $apt::params::debian_url,
+ $security_url = $apt::params::security_url,
+ $lts_url = $apt::params::lts_url,
+ $volatile_url = $apt::params::volatile_url,
+ $ubuntu_url = $apt::params::ubuntu_url,
+ $repos = $apt::params::repos,
+ $custom_preferences = $apt::params::custom_preferences,
$custom_sources_list = '',
- $custom_key_dir = $apt::params::custom_key_dir
+ $custom_key_dir = $apt::params::custom_key_dir,
) inherits apt::params {
package { 'apt':
diff --git a/manifests/listchanges.pp b/manifests/listchanges.pp
index 2c5641a..642986b 100644
--- a/manifests/listchanges.pp
+++ b/manifests/listchanges.pp
@@ -1,12 +1,13 @@
-class apt::listchanges(
+class apt::listchanges (
$ensure_version = 'installed',
- $config = "apt/${::operatingsystem}/listchanges.erb",
- $frontend = 'mail',
- $email = 'root',
- $confirm = '0',
- $saveseen = '/var/lib/apt/listchanges.db',
- $which = 'both'
+ $config = "apt/${::operatingsystem}/listchanges.erb",
+ $frontend = 'mail',
+ $email = 'root',
+ $confirm = '0',
+ $saveseen = '/var/lib/apt/listchanges.db',
+ $which = 'both',
){
+
package { 'apt-listchanges':
ensure => $ensure_version
}
diff --git a/manifests/params.pp b/manifests/params.pp
index 2b18eb5..463cd63 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,14 +1,14 @@
class apt::params () {
- $use_lts = false
- $use_volatile = false
- $use_backports = true
- $include_src = false
+ $use_lts = false
+ $use_volatile = false
+ $use_backports = true
+ $include_src = false
$use_next_release = false
- $debian_url = 'http://httpredir.debian.org/debian/'
- $security_url = 'http://security.debian.org/'
- $ubuntu_url = 'http://archive.ubuntu.com/ubuntu'
- $lts_url = $debian_url
- $volatile_url = 'http://volatile.debian.org/debian-volatile/'
+ $debian_url = 'http://httpredir.debian.org/debian/'
+ $security_url = 'http://security.debian.org/'
+ $ubuntu_url = 'http://archive.ubuntu.com/ubuntu'
+ $lts_url = $debian_url
+ $volatile_url = 'http://volatile.debian.org/debian-volatile/'
case $::operatingsystem {
'debian': {
$repos = 'main contrib non-free'
diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp
index 2b2fb74..e142ea0 100644
--- a/manifests/preferences_snippet.pp
+++ b/manifests/preferences_snippet.pp
@@ -1,10 +1,10 @@
define apt::preferences_snippet (
$priority = undef,
- $package = false,
- $ensure = 'present',
- $source = undef,
- $release = undef,
- $pin = undef
+ $package = false,
+ $ensure = 'present',
+ $source = undef,
+ $release = undef,
+ $pin = undef,
) {
$real_package = $package ? {
diff --git a/manifests/preseeded_package.pp b/manifests/preseeded_package.pp
index 162ade7..5a2979f 100644
--- a/manifests/preseeded_package.pp
+++ b/manifests/preseeded_package.pp
@@ -1,8 +1,10 @@
# Install a package with a preseed file to automatically answer some questions.
+
define apt::preseeded_package (
- $ensure = 'installed',
- $content = ''
+ $ensure = 'installed',
+ $content = '',
) {
+
$seedfile = "/var/cache/local/preseeding/${name}.seeds"
$real_content = $content ? {
'' => template ( "site_apt/${::debian_codename}/${name}.seeds" ),
diff --git a/manifests/proxy_client.pp b/manifests/proxy_client.pp
index e7972f7..0793878 100644
--- a/manifests/proxy_client.pp
+++ b/manifests/proxy_client.pp
@@ -1,7 +1,7 @@
-class apt::proxy_client(
+class apt::proxy_client (
$proxy = 'http://localhost',
- $port = '3142',
-){
+ $port = '3142',
+) {
::apt::apt_conf { '20proxy':
content => template('apt/20proxy.erb'),
diff --git a/manifests/sources_list.pp b/manifests/sources_list.pp
index 6ff4fc3..22bc110 100644
--- a/manifests/sources_list.pp
+++ b/manifests/sources_list.pp
@@ -2,7 +2,7 @@
define apt::sources_list (
$ensure = 'present',
$source = undef,
- $content = undef
+ $content = undef,
) {
if $ensure == 'present' {
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index dff911d..85d21d4 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -1,10 +1,10 @@
class apt::unattended_upgrades (
- $config_content = undef,
- $config_template = 'apt/50unattended-upgrades.erb',
- $mailonlyonerror = true,
- $mail_recipient = 'root',
+ $config_content = undef,
+ $config_template = 'apt/50unattended-upgrades.erb',
+ $mailonlyonerror = true,
+ $mail_recipient = 'root',
$blacklisted_packages = [],
- $ensure_version = present
+ $ensure_version = 'present',
) {
package { 'unattended-upgrades':
diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp
index 73eb48b..54dbff6 100644
--- a/manifests/upgrade_package.pp
+++ b/manifests/upgrade_package.pp
@@ -1,7 +1,7 @@
# Install a package either to a certain version, or while making sure that it's
# always the latest version that's installed.
define apt::upgrade_package (
- $version = ''
+ $version = '',
) {
$version_suffix = $version ? {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 06:20:46 +0000