Fix repo handling on debian wheezy

* fixes turning manage_repos on on wheezy * fixes deprecation warning in apt::key on wheezy * requires puppetlabs/apt >= 1.8.0 fixes voxpupuli#110
rayward · Sep 27, 2015 · ba6cb18 · ba6cb18
1 parent 13b29dd
commit ba6cb18
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.5.0
+ * Fix a bug turning `manage_repos` of on wheezy
+ * Fix a deprecation warning on apt::key when using manage_repos on wheezy (#110)
+   This change requires puppetlabs/apt at >= 1.8.0
+
 ## 3.4.2
  * Fix a bug that changed the default of `php::manage_repos` to `false` on
    Debian-based operating systems except wheezy. It should be turned on by

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -35,7 +35,7 @@
 
       case $::operatingsystem {
         'Debian': {
-          $manage_repos = $::lsbdistcodenameid == 'wheezy'
+          $manage_repos = $::lsbdistcodename == 'wheezy'
         }
 
         'Ubuntu': {

diff --git a/manifests/repo/debian.pp b/manifests/repo/debian.pp
@@ -25,7 +25,10 @@
   $release      = 'wheezy-php55',
   $repos        = 'all',
   $include_src  = false,
-  $key          = { 'id' => '7E3F070089DF5277', 'source' => 'http://www.dotdeb.org/dotdeb.gpg' },
+  $key          = {
+    'id'     => '6572BBEF1B5FF28B28B706837E3F070089DF5277',
+    'source' => 'http://www.dotdeb.org/dotdeb.gpg'
+  },
   $dotdeb       = true,
 ) {
 

diff --git a/metadata.json b/metadata.json
@@ -10,7 +10,7 @@
   "description": "Puppet module that aims to manage PHP and extensions in a generic way on many platforms with sane defaults and easy, hiera-centric configuration",
   "dependencies": [
     { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.2.0 < 5.0.0" },
-    { "name": "puppetlabs/apt", "version_requirement": ">= 1.0.0 < 3.0.0" },
+    { "name": "puppetlabs/apt", "version_requirement": ">= 1.8.0 < 3.0.0" },
     { "name": "puppetlabs/inifile", "version_requirement": "1.x" },
     { "name": "darin/zypprepo", "version_requirement": "1.x" },
     { "name": "example42/yum", "version_requirement": "2.x" }