reformatted whitespace to match recommended style

of 2 space indentation.

diff --git a/manifests/debian/testing.pp b/manifests/debian/testing.pp
index 8f37bd567c29d90be669762663b068f267352b51..4eec1f8dbb65616632b6b886f6028e77f3c249db 100644 (file)
--- a/manifests/debian/testing.pp
+++ b/manifests/debian/testing.pp
@@ -2,20 +2,20 @@
 
 class apt::debian::testing {
 
-       # deb http://debian.mirror.iweb.ca/debian/ testing main contrib non-free
-       # deb-src http://debian.mirror.iweb.ca/debian/ testing main contrib non-free
-       # Key: 55BE302B  Server: subkeys.pgp.net
-       # debian-keyring
-       # debian-archive-keyring
-       
-       apt::source { "debian_testing":
-               location => "http://debian.mirror.iweb.ca/debian/",
-               release => "testing",
-               repos => "main contrib non-free",
-               required_packages => "debian-keyring debian-archive-keyring",
-               key => "55BE302B",
-               key_server => "subkeys.pgp.net",
-               pin => "-10"
-       }
+  # deb http://debian.mirror.iweb.ca/debian/ testing main contrib non-free
+  # deb-src http://debian.mirror.iweb.ca/debian/ testing main contrib non-free
+  # Key: 55BE302B  Server: subkeys.pgp.net
+  # debian-keyring
+  # debian-archive-keyring
+
+  apt::source { "debian_testing":
+    location => "http://debian.mirror.iweb.ca/debian/",
+    release => "testing",
+    repos => "main contrib non-free",
+    required_packages => "debian-keyring debian-archive-keyring",
+    key => "55BE302B",
+    key_server => "subkeys.pgp.net",
+    pin => "-10"
+  }
 
 }

diff --git a/manifests/debian/unstable.pp b/manifests/debian/unstable.pp
index d0dd1ce13400241a0b295f001f5190829760042a..89e5d9a9fb10c7468f701389d4f4f8009cca1994 100644 (file)
--- a/manifests/debian/unstable.pp
+++ b/manifests/debian/unstable.pp
@@ -2,20 +2,20 @@
 
 class apt::debian::unstable {
 
-       # deb http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
-       # deb-src http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
-       # Key: 55BE302B  Server: subkeys.pgp.net
-       # debian-keyring
-       # debian-archive-keyring
-       
-       apt::source { "debian_unstable":
-               location => "http://debian.mirror.iweb.ca/debian/",
-               release => "unstable",
-               repos => "main contrib non-free",
-               required_packages => "debian-keyring debian-archive-keyring",
-               key => "55BE302B",
-               key_server => "subkeys.pgp.net",
-               pin => "-10"
-       }
+ # deb http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
+ # deb-src http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
+ # Key: 55BE302B  Server: subkeys.pgp.net
+ # debian-keyring
+ # debian-archive-keyring
+ 
+ apt::source { "debian_unstable":
+   location => "http://debian.mirror.iweb.ca/debian/",
+   release => "unstable",
+   repos => "main contrib non-free",
+   required_packages => "debian-keyring debian-archive-keyring",
+   key => "55BE302B",
+   key_server => "subkeys.pgp.net",
+   pin => "-10"
+ }
 
 }

diff --git a/manifests/force.pp b/manifests/force.pp
index 564ed75ff4db02fabc6214b2a1c5434e6c100f61..0a3007d0e534bf69ff84254b5c3c7dde2c2a3d35 100644 (file)
--- a/manifests/force.pp
+++ b/manifests/force.pp
@@ -2,15 +2,15 @@
 # force a package from a specific release
 
 define apt::force(
-       $release = 'testing',
-       $version = false
+  $release = 'testing',
+  $version = false
 ) {
 
-       exec { "/usr/bin/aptitude -y -t ${release} install ${name}":
-               unless => $version ? {
-                       false => "/usr/bin/dpkg -l | grep ${name}",
-                       default => "/usr/bin/dpkg -l | grep ${name} | grep ${version}"
-               }
-       }
+  exec { "/usr/bin/aptitude -y -t ${release} install ${name}":
+    unless => $version ? {
+      false => "/usr/bin/dpkg -l | grep ${name}",
+      default => "/usr/bin/dpkg -l | grep ${name} | grep ${version}"
+    }
+  }
 
 }

diff --git a/manifests/init.pp b/manifests/init.pp
index 03ef116193745f4f52f842b27483eb3c79b53bc5..8042c8be198a2e1c50938899c76151700d63abde 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -28,20 +28,20 @@ class apt(
 
   package { "python-software-properties": }
 
-       file { "sources.list":
-               ensure => present,
-               owner => root,
-               group => root,
-               mode => 644,
-       }
+  file { "sources.list":
     name => "${apt::params::root}/sources.list",
+    ensure => present,
+    owner => root,
+    group => root,
+    mode => 644,
+  }
 
-       file { "sources.list.d":
-               ensure => directory,
-               owner => root,
-               group => root,
-       }
+  file { "sources.list.d":
     name => "${apt::params::root}/sources.list.d",
+    ensure => directory,
+    owner => root,
+    group => root,
+  }
 
   exec { "apt_update":
     command => "${apt::params::provider} update",

diff --git a/manifests/pin.pp b/manifests/pin.pp
index d13193f315fc654109f5b7ab9a172f8a3afd9761..3485b2473d1aa11ac3d55f34133a697427df0bdc 100644 (file)
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -2,18 +2,18 @@
 # pin a release in apt, useful for unstable repositories
 
 define apt::pin(
-       $packages = '*',
-       $priority = 0
+  $packages = '*',
+  $priority = 0
 ) {
 
-       file { "${name}.pref":
-               ensure => file,
-               owner => root,
-               group => root,
-               mode => 644,
-               content => "# ${name}\nPackage: ${packages}\nPin: release a=${name}\nPin-Priority: ${priority}",
-       }
   include apt::params
 
+  file { "${name}.pref":
     name => "${apt::params::root}/preferences.d/${name}",
+    ensure => file,
+    owner => root,
+    group => root,
+    mode => 644,
+    content => "# ${name}\nPackage: ${packages}\nPin: release a=${name}\nPin-Priority: ${priority}",
+  }
 }

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index dd2143e246aea2e35e46bf69ba2004b29a9bec20..8dcea856ede5c7e64580714137cfae50b86638fe 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -4,14 +4,14 @@ define apt::ppa() {
 
   Class['apt'] -> Apt::Ppa[$title]
 
-    exec { "apt-update-${name}":
-        command     => "/usr/bin/aptitude update",
-        refreshonly => true,
-    }
+  exec { "apt-update-${name}":
+    command     => "/usr/bin/aptitude update",
+    refreshonly => true,
+  }
 
-    exec { "add-apt-repository-${name}":
-        command => "/usr/bin/add-apt-repository ${name}",
-        notify  => Exec["apt-update-${name}"],
-    }
+  exec { "add-apt-repository-${name}":
+    command => "/usr/bin/add-apt-repository ${name}",
+    notify  => Exec["apt-update-${name}"],
+  }
 }
 

diff --git a/manifests/release.pp b/manifests/release.pp
index 6df52a999190ca25fa950166798f0eee023baca6..9fc0aa38dd58f23a1067dd1347493054a4aabd56 100644 (file)
--- a/manifests/release.pp
+++ b/manifests/release.pp
@@ -4,12 +4,12 @@ class apt::release (
   $release_id
 ) {
 
-               owner => root,
-               group => root,
-               mode => 644,
-       }
   include apt::params
 
   file { "${apt::params::root}/apt.conf.d/01release":
+    owner => root,
+    group => root,
+    mode => 644,
     content => "APT::Default-Release \"${release_id}\";"
+  }
 }

diff --git a/manifests/source.pp b/manifests/source.pp
index 7dee0a985f4fa96f10cf73a5efdb5f21c0e96688..b6e8476b4cff5b33fa4780dff45d4cf2a181ec00 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -2,48 +2,49 @@
 # add an apt source
 
 define apt::source(
-       $location = '',
-       $release = 'karmic',
-       $repos = 'main',
-       $include_src = true,
-       $required_packages = false,
-       $key = false,
-       $key_server = 'keyserver.ubuntu.com',
-       $pin = false
+  $location = '',
+  $release = 'karmic',
+  $repos = 'main',
+  $include_src = true,
+  $required_packages = false,
+  $key = false,
+  $key_server = 'keyserver.ubuntu.com',
+  $pin = false
 ) {
 
-       file { "${name}.list":
-               ensure => file,
-               owner => root,
-               group => root,
-               mode => 644,
-               content => template("apt/source.list.erb"),
-       }
-
-       if $pin != false {
-               apt::pin { "${release}": priority => "${pin}" }
-       }
-
-       exec { "${name} apt update":
-               subscribe => File["${name}.list"],
-               refreshonly => true,
-       }
-
-       if $required_packages != false {
-                       subscribe => File["${name}.list"],
-                       refreshonly => true,
-               }
-       }
-
-       if $key != false {
-               exec { "/usr/bin/apt-key adv --keyserver ${key_server} --recv-keys ${key}":
-                       unless => "/usr/bin/apt-key list | grep ${key}",
-                       before => File["${name}.list"],
-               }
-       }
   include apt::params
 
+
+  file { "${name}.list":
     name => "${apt::params::root}/sources.list.d/${name}.list",
+    ensure => file,
+    owner => root,
+    group => root,
+    mode => 644,
+    content => template("apt/source.list.erb"),
+  }
+
+  if $pin != false {
+    apt::pin { "${release}": priority => "${pin}" }
+  }
+
+  exec { "${name} apt update":
     command => "${apt::params::provider} update",
+    subscribe => File["${name}.list"],
+    refreshonly => true,
+  }
+
+  if $required_packages != false {
     exec { "${apt::params::provider} -y install ${required_packages}":
+      subscribe => File["${name}.list"],
+      refreshonly => true,
+    }
+  }
+
+  if $key != false {
+    exec { "/usr/bin/apt-key adv --keyserver ${key_server} --recv-keys ${key}":
+      unless => "/usr/bin/apt-key list | grep ${key}",
+      before => File["${name}.list"],
+    }
+  }
 }