From: Dan Bode <dan@puppetlabs.com>
Date: Mon, 30 May 2011 17:24:06 +0000 (-0700)
Subject: reformatted whitespace to match recommended style
X-Git-Tag: 0.0.1~26
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=77d2b0dd05c70aad99596dc314be065e06cfb4cf;p=puppet-modules%2Fpuppetlabs-apt.git

reformatted whitespace to match recommended style
of 2 space indentation.
---

diff --git a/manifests/debian/testing.pp b/manifests/debian/testing.pp
index 8f37bd5..4eec1f8 100644
--- 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 d0dd1ce..89e5d9a 100644
--- 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 564ed75..0a3007d 100644
--- 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 03ef116..8042c8b 100644
--- 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 d13193f..3485b24 100644
--- 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 dd2143e..8dcea85 100644
--- 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 6df52a9..9fc0aa3 100644
--- 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 7dee0a9..b6e8476 100644
--- 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"],
+    }
+  }
 }