format standardization

diff --git a/manifests/apt_conf.pp b/manifests/apt_conf.pp
index 62e43771b881b57597fb632ad529db1b2afd896d..a18a9bdae0b1c3f0e59a5385c7381d54c33f8311 100644 (file)
--- a/manifests/apt_conf.pp
+++ b/manifests/apt_conf.pp
@@ -1,11 +1,13 @@
 define apt::apt_conf(
   $ensure = 'present',
   $source = '',
-  $content = undef
-){
+  $content = undef )
+{
+
   if $source == '' and $content == undef {
     fail("One of \$source or \$content must be specified for apt_conf ${name}")
   }
+
   if $source != '' and $content != undef {
     fail("Only one of \$source or \$content must specified for apt_conf ${name}")
   }

diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp
index 2cfbefb98d77881e30960c3ec048125d64ce0fa9..de55772b4c49bba019dbf82c0bdfa5456976ba77 100644 (file)
--- a/manifests/cron/base.pp
+++ b/manifests/cron/base.pp
@@ -1,3 +1,4 @@
 class apt::cron::base {
-       package { cron-apt: ensure => installed }
+
+  package { cron-apt: ensure => installed }
 }

diff --git a/manifests/dselect.pp b/manifests/dselect.pp
index 52c66cb1d621dc1dfe7f707bfe21caae4da4efb2..45a5ddc7493533c9c15ed82333d6605b0c258c83 100644 (file)
--- a/manifests/dselect.pp
+++ b/manifests/dselect.pp
@@ -1,4 +1,5 @@
 class apt::dselect {
+
   # suppress annoying help texts of dselect
   append_if_no_such_line { dselect_expert:
       file => "/etc/dpkg/dselect.cfg",

diff --git a/manifests/init.pp b/manifests/init.pp
index e7eac334acd2f41036548ebbedf59aea61c7490c..4ca2b2e132f1c63e6c439dc0b2b1f60ddc0ae913 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -88,23 +88,23 @@ class apt {
   }
 
   apt_conf { "02show_upgraded":
-    source => ["puppet:///modules/site-apt/${fqdn}/02show_upgraded",
-               "puppet:///modules/site-apt/02show_upgraded",
-               "puppet:///modules/apt/02show_upgraded"]
+    source => [ "puppet:///modules/site-apt/${fqdn}/02show_upgraded",
+                "puppet:///modules/site-apt/02show_upgraded",
+                "puppet:///modules/apt/02show_upgraded" ]
   }
 
   if ( $virtual == "vserver" ) {
     apt_conf { "03clean_vserver":
-      source => ["puppet:///modules/site-apt/${fqdn}/03clean_vserver",
-                 "puppet:///modules/site-apt/03clean_vserver",
-                 "puppet:///modules/apt/03clean_vserver"]
+      source => [ "puppet:///modules/site-apt/${fqdn}/03clean_vserver",
+                  "puppet:///modules/site-apt/03clean_vserver",
+                  "puppet:///modules/apt/03clean_vserver" ]
     }
   }
   else {
     apt_conf { "03clean":
-      source => ["puppet:///modules/site-apt/${fqdn}/03clean",
-                 "puppet:///modules/site-apt/03clean",
-                 "puppet:///modules/apt/03clean"]
+      source => [ "puppet:///modules/site-apt/${fqdn}/03clean",
+                  "puppet:///modules/site-apt/03clean",
+                  "puppet:///modules/apt/03clean" ]
     }
   }
     
@@ -121,13 +121,9 @@ class apt {
 
   # backward compatibility: upgrade from previous versions of this module.
   file {
-    ["/etc/apt/apt.conf.d/from_puppet",
-     "/etc/apt/apt.conf.d/99from_puppet"
-    ]:
+    [ "/etc/apt/apt.conf.d/from_puppet", "/etc/apt/apt.conf.d/99from_puppet" ]:
       ensure  => 'absent',
-      require => [ Apt_conf['02show_upgraded'],
-                   Apt_conf['03clean'],
-                 ],
+      require => [ Apt_conf['02show_upgraded'], Apt_conf['03clean'] ];
   }
 
   # watch .d directories and ensure they are present
@@ -143,13 +139,12 @@ class apt {
     'refresh_apt':
       command => '/usr/bin/apt-get update && sleep 1',
       refreshonly => true,
-      subscribe => [ File['/etc/apt/apt.conf.d'],
-                     Config_file['/etc/apt/sources.list'] ];
+      subscribe => [ File['/etc/apt/apt.conf.d'], Config_file['/etc/apt/sources.list'] ];
+
     'update_apt':
       command => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean',
       refreshonly => true,
-      require => [ File['/etc/apt/apt.conf.d',
-                        '/etc/apt/preferences'],
+      require => [ File['/etc/apt/apt.conf.d', '/etc/apt/preferences' ],
                    Config_file['/etc/apt/sources.list'] ],
       loglevel => info,
       # Another Semaphor for all packages to reference

diff --git a/manifests/preferences.pp b/manifests/preferences.pp
index 4acfdaf33ca2b540e4d25b9496efca10ddef2b37..4c93542e4249a7bd3c9d8c16a81da10cd006e6a6 100644 (file)
--- a/manifests/preferences.pp
+++ b/manifests/preferences.pp
@@ -3,7 +3,7 @@ class apt::preferences {
   include common::moduledir
   $apt_preferences_dir = "${common::moduledir::module_dir_path}/apt/preferences"
   module_dir{'apt/preferences': }
-  file{"${apt_preferences_dir}_header":
+  file { "${apt_preferences_dir}_header":
     content => $custom_preferences ? {
       '' => $operatingsystem ? {
         'debian' => template("apt/${operatingsystem}/preferences_${codename}.erb"),
@@ -13,7 +13,7 @@ class apt::preferences {
     },
   }
 
-  concatenated_file{'/etc/apt/preferences':
+  concatenated_file { '/etc/apt/preferences':
     dir => $apt_preferences_dir,
     header => "${apt_preferences_dir}_header",
     # use Concatenated_file[apt_config] to reference a completed configuration

diff --git a/manifests/preferences/absent.pp b/manifests/preferences/absent.pp
index d8b2e10d50111bcf6bc80d3fe7efdcd536965a2d..0e96119a36cfd30cbb2695e7539f5ac4f377e2eb 100644 (file)
--- a/manifests/preferences/absent.pp
+++ b/manifests/preferences/absent.pp
@@ -1,5 +1,6 @@
 class apt::preferences::absent {
-  file {'/etc/apt/preferences':
+
+  file { '/etc/apt/preferences':
     ensure => absent,
   }
 }

diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp
index fd2956de5c5cb693a589bedaf05fdaa88c2302e4..4b8e575e5fc38912792f1b3e1e9aac0ffdc95f94 100644 (file)
--- a/manifests/preferences_snippet.pp
+++ b/manifests/preferences_snippet.pp
@@ -2,8 +2,9 @@ define apt::preferences_snippet(
   $ensure = 'present',
   $source = '',
   $release,
-  $priority
-){
+  $priority )
+{
+
   if $custom_preferences == false {
     fail("Trying to define a preferences_snippet with \$custom_preferences set to false.")
   }

diff --git a/manifests/preseeded_package.pp b/manifests/preseeded_package.pp
index 76c432ea185487599105613c83f5d0831676e33e..8f3bcbd128a2d079fbc1e1e7a671aad15131cdbc 100644 (file)
--- a/manifests/preseeded_package.pp
+++ b/manifests/preseeded_package.pp
@@ -5,7 +5,7 @@ define apt::preseeded_package ($content = "", $ensure = "installed") {
     default => $content
   }   
 
-  file{ $seedfile:
+  file { $seedfile:
     content => $real_content,
     mode => 0600, owner => root, group => root,
   }   

diff --git a/manifests/sources_list.pp b/manifests/sources_list.pp
index bbf887a399976db4397c1418509afeb0fe4513b8..ff8f21a0f1101ff4d9d310effac399b9d2aa9d52 100644 (file)
--- a/manifests/sources_list.pp
+++ b/manifests/sources_list.pp
@@ -1,8 +1,9 @@
 define apt::sources_list (
   $ensure = 'present',
   $source = '',
-  $content = undef
-) {
+  $content = undef )
+{
+
   if $source == '' and $content == undef {
     fail("One of \$source or \$content must be specified for apt_sources_snippet ${name}")
   }

diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index f52448d71d04c0e48ff76712622a44f0d7ed8bdb..e2992f81c839d673348bdf06728a61b9fd86e311 100644 (file)
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -1,5 +1,6 @@
 class apt::unattended_upgrades {
-  package{'unattended-upgrades':
+
+  package { 'unattended-upgrades':
     ensure => present,
     require => undef,
   }

diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp
index 41d5d5205275358f7a9b4425827b0686ab434639..99e9c2aaaacb21bfacf34a2993c90e7aa2ddb250 100644 (file)
--- a/manifests/upgrade_package.pp
+++ b/manifests/upgrade_package.pp
@@ -1,4 +1,5 @@
 define apt::upgrade_package ($version = "") {
+
   case $version {
     '': {
       exec { "aptitude -y install $name":