Browse Source

Example updates

Morgan Haskel 9 years ago
parent
commit
0f26779a2a
2 changed files with 4 additions and 5 deletions
  1. 3 4
      examples/backports.pp
  2. 1 1
      examples/disable_keys.pp

+ 3 - 4
examples/backports.pp

@@ -1,7 +1,7 @@
 $location = $::apt::distcodename ? {
   'squeeze' => 'http://backports.debian.org/debian-backports',
   'wheezy'  => 'http://ftp.debian.org/debian/',
-  default   => 'http://us.archive.ubuntu.com/ubuntu',
+  default   => 'http://archive.ubuntu.com/ubuntu',
 }
 
 if $::apt::distid == 'debian' {
@@ -16,7 +16,6 @@ if $::apt::distid == 'debian' {
 
 # set up the actual backports
 apt::pin { 'backports':
-  before   => Apt::Source['backports'],
   release  => "${release}-backports",
   priority => 200,
 }
@@ -26,7 +25,7 @@ apt::source { 'backports':
   release  => "${release}-backports",
   repos    => $repos,
   key      => {
-    id       => $key,
-    server   => 'pgp.mit.edu',
+    id     => $key,
+    server => 'pgp.mit.edu',
   },
 }

+ 1 - 1
examples/disable_keys.pp

@@ -1,4 +1,4 @@
-#Note: This is generally a bad idea. You should not disable keys.
+#Note: This is generally a bad idea. You should not disable verifying repository signatures.
 apt::conf { 'unauth':
   priority => 99,
   content  => 'APT::Get::AllowUnauthenticated 1;'