Browse Source

apt: Migrate to puppetlabs/apt 2.x

Sebastien Badia 8 years ago
parent
commit
e3d04985fa
1 changed files with 12 additions and 17 deletions
  1. 12 17
      manifests/apt.pp

+ 12 - 17
manifests/apt.pp

@@ -12,32 +12,27 @@ class public::apt {
   $downcase_lsbdistid = downcase($::lsbdistid)
   $downcase_lsbdistid = downcase($::lsbdistid)
 
 
   apt::source { "${downcase_lsbdistid}_${::lsbdistcodename}":
   apt::source { "${downcase_lsbdistid}_${::lsbdistcodename}":
-    location    => "http://ftp.fr.debian.org/${downcase_lsbdistid}/",
-    release     => $::lsbdistcodename,
-    repos       => 'main contrib non-free',
-    include_src => true,
+    location => "http://ftp.fr.debian.org/${downcase_lsbdistid}/",
+    release  => $::lsbdistcodename,
+    repos    => 'main contrib non-free',
   }
   }
 
 
   apt::source { "${downcase_lsbdistid}_${::lsbdistcodename}_security":
   apt::source { "${downcase_lsbdistid}_${::lsbdistcodename}_security":
-    location          => 'http://security.debian.org',
-    release           => "${::lsbdistcodename}/updates",
-    repos             => 'main',
-    required_packages => 'debian-keyring debian-archive-keyring',
-    include_src       => true,
+    location => 'http://security.debian.org',
+    release  => "${::lsbdistcodename}/updates",
+    repos    => 'main',
   }
   }
 
 
   apt::source { "${downcase_lsbdistid}_${::lsbdistcodename}_updates":
   apt::source { "${downcase_lsbdistid}_${::lsbdistcodename}_updates":
-    location    => "http://ftp.fr.debian.org/${downcase_lsbdistid}/",
-    release     => "${::lsbdistcodename}-updates",
-    repos       => 'main',
-    include_src => true,
+    location => "http://ftp.fr.debian.org/${downcase_lsbdistid}/",
+    release  => "${::lsbdistcodename}-updates",
+    repos    => 'main',
   }
   }
 
 
   apt::source { "${downcase_lsbdistid}_${::lsbdistcodename}_backports":
   apt::source { "${downcase_lsbdistid}_${::lsbdistcodename}_backports":
-    location    => "http://ftp.fr.debian.org/${downcase_lsbdistid}/",
-    release     => "${::lsbdistcodename}-backports",
-    repos       => 'main',
-    include_src => true,
+    location => "http://ftp.fr.debian.org/${downcase_lsbdistid}/",
+    release  => "${::lsbdistcodename}-backports",
+    repos    => 'main',
   }
   }
 
 
 }
 }