Fix: disable deb.sury repo by default

diff --git a/manifests/dpa.pp b/manifests/dpa.pp
index d159b367eaf87f9ce3800aae14d2d4122ab80400..26cdf6923a51969d17ce2bf7e2a9f0fa5ffabb00 100644 (file)
--- a/manifests/dpa.pp
+++ b/manifests/dpa.pp
@@ -1,4 +1,12 @@
-class php::dpa inherits php::repository {
+class php::dpa(
+  $ensure = 'present',
+) {
+  class { 'php::repository':
+    ensure       => $ensure,
+    content      => "deb [signed-by=/etc/apt/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ ${::lsbdistcodename} main\n",
+    dependencies => File['/etc/apt/keyrings/deb.sury.org-php.gpg'],
+  }
+
   # Old location
   file { '/etc/apt/trusted.gpg.d/deb.sury.org-php.gpg':
     ensure  => absent,
@@ -9,22 +17,17 @@ class php::dpa inherits php::repository {
   }
 
   file { '/etc/apt/keyrings/deb.sury.org-php.gpg':
-    ensure  => present,
+    ensure  => $ensure,
     owner   => "root",
     group   => "root",
     mode    => "0644",
     source  => 'puppet:///modules/php/deb.sury.org.gpg',
   }
 
-  File['/etc/apt/sources.list.d/php.list'] {
-    content => "deb [signed-by=/etc/apt/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ ${::lsbdistcodename} main\n",
-    require => File['/etc/apt/keyrings/deb.sury.org-php.gpg'],
-  }
-
   # Pinning
   # Adapted from https://dmvrtx.me/2023/06/php-7.4-on-debian-bookworm/
   file { '/etc/apt/preferences.d/php':
-    ensure  => present,
+    ensure  => $ensure,
     owner   => "root",
     group   => "root",
     mode    => "0644",

diff --git a/manifests/params.pp b/manifests/params.pp
index 242645cb601fbbd9853aaaf22170d7fe2666cbaa..c7a665b331a5e45f964c959de3d2c3c55ecb5371 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,12 +1,15 @@
 class php::params {
+  # Previously, 8.4 was used as the default version. But many official Debian
+  # packages depend on the version currently shipped by Debian.
   $version8 = $::lsbdistcodename ? {
-    'bookworm' => '8.4',
-    default    => '8.4',
+    'bookworm' => '8.2',
+    default    => '8.2',
   }
 
+  # Any other version that may have been previously installed in the system.
   $version8_previous = $::lsbdistcodename ? {
-    'bookworm' => [ '8.3', '8.2', '8.1', '8.0' ],
-    default    => [ '8.3', '8.2', '8.1', '8.0' ],
+    'bookworm' => [ '8.4', '8.3', '8.1', '8.0' ],
+    default    => [ '8.4', '8.3', '8.1', '8.0' ],
   }
 
   $version7 = $::lsbdistcodename ? {

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 07b96fa6ce633581df546cab62f9e0d209a5b4ea..70beec7716514512c45fe65cec26114d21c53c8c 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,4 +1,12 @@
-class php::ppa inherits php::repository {
+class php::ppa(
+  $ensure = 'present',
+) {
+  class { 'php::repository':
+    ensure       => $ensure,
+    content      => "deb [signed-by=/etc/apt/keyrings/ondrej_ubuntu_php.gpg] http://ppa.launchpad.net/ondrej/php/ubuntu ${::lsbdistcodename} main\n",
+    dependencies => File['/etc/apt/keyrings/ondrej_ubuntu_php.gpg'],
+  }
+
   #package { 'python-software-properties':
   #  ensure => present,
   #}
@@ -13,7 +21,7 @@ class php::ppa inherits php::repository {
 
   # Old location
   file { '/etc/apt/trusted.gpg.d/ondrej_ubuntu_php.gpg':
-    ensure  => present,
+    ensure  => absent,
     owner   => "root",
     group   => "root",
     mode    => "0644",
@@ -22,16 +30,11 @@ class php::ppa inherits php::repository {
   }
 
   file { '/etc/apt/keyrings/ondrej_ubuntu_php.gpg':
-    ensure  => present,
+    ensure  => $ensure,
     owner   => "root",
     group   => "root",
     mode    => "0644",
     source  => 'puppet:///modules/php/ondrej_ubuntu_php.gpg',
     notify  => Exec['php-apt-auto-update'],
   }
-
-  File['/etc/apt/sources.list.d/php.list'] {
-    content => "deb [signed-by=/etc/apt/keyrings/ondrej_ubuntu_php.gpg] http://ppa.launchpad.net/ondrej/php/ubuntu ${::lsbdistcodename} main\n",
-    require => File['/etc/apt/keyrings/ondrej_ubuntu_php.gpg'],
-  }
 }

diff --git a/manifests/repository.pp b/manifests/repository.pp
index 01b4dbfba01a659174c2dca865ff3309ce2fc4f7..2c5ffd48c30ea6fd1fb282dc124ee276f7ea54b5 100644 (file)
--- a/manifests/repository.pp
+++ b/manifests/repository.pp
@@ -1,9 +1,15 @@
-class php::repository {
+class php::repository(
+  $ensure      = 'present',
+  $content     = undef,
+  $dependencies = undef,
+) {
   file { '/etc/apt/sources.list.d/php.list':
-    ensure  => present,
+    ensure  => $ensure,
     owner   => "root",
     group   => "root",
     mode    => "0644",
+    content => $content,
+    require => $dependencies,
     notify  => Exec['php-apt-auto-update'],
   }
 

diff --git a/manifests/series5.pp b/manifests/series5.pp
index 8a9149c51326e55400c431d7631a62e2774c5a7e..07cbc0d1be86d28b8218b6d325b02d6e98a894d4 100644 (file)
--- a/manifests/series5.pp
+++ b/manifests/series5.pp
@@ -1,25 +1,38 @@
 class php::series5(
   $hardened       = true,
   $manage_mod_php = false,
+  $deb_sury_repo  = 'absent',
 ) {
   case $::lsbdistcodename {
     'xenial': {
-      include php::ppa
+      class { 'php::ppa':
+        ensure => $deb_sury_repo,
+      }
     }
     'trusty': {
-      include php::ppa
+      class { 'php::ppa':
+        ensure => $deb_sury_repo,
+      }
     }
     'bookworm': {
-      include php::dpa
+      class { 'php::dpa':
+        ensure => $deb_sury_repo,
+      }
     }
     'bullseye': {
-      include php::dpa
-    }
-    'buster': {
-      include php::dpa
+      class { 'php::dpa':
+        ensure => $deb_sury_repo,
+      }
     }
     'stretch': {
-      include php::dpa
+      class { 'php::dpa':
+        ensure => $deb_sury_repo,
+      }
+    }
+    'buster': {
+      class { 'php::dpa':
+        ensure => $deb_sury_repo,
+      }
     }
   }
 

diff --git a/manifests/series7.pp b/manifests/series7.pp
index bc3a4b1d8ed57ba8f9e2afded3809c12cc54d17e..ba68097606974361d2c0fd6a6c4b702ff092d982 100644 (file)
--- a/manifests/series7.pp
+++ b/manifests/series7.pp
@@ -1,25 +1,38 @@
 class php::series7(
   $hardened       = true,
   $manage_mod_php = false,
+  $deb_sury_repo  = 'absent',
 ) {
   case $::lsbdistcodename {
     'xenial': {
-      include php::ppa
+      class { 'php::ppa':
+        ensure => $deb_sury_repo,
+      }
     }
     'trusty': {
-      include php::ppa
+      class { 'php::ppa':
+        ensure => $deb_sury_repo,
+      }
     }
     'bookworm': {
-      include php::dpa
+      class { 'php::dpa':
+        ensure => $deb_sury_repo,
+      }
     }
     'bullseye': {
-      include php::dpa
+      class { 'php::dpa':
+        ensure => $deb_sury_repo,
+      }
     }
     'stretch': {
-      include php::dpa
+      class { 'php::dpa':
+        ensure => $deb_sury_repo,
+      }
     }
     'buster': {
-      include php::dpa
+      class { 'php::dpa':
+        ensure => $deb_sury_repo,
+      }
     }
   }
 

diff --git a/manifests/series8.pp b/manifests/series8.pp
index 00192ea65a2df80b9bba4bb5514099b6d5db5e4d..c377c783a0fb205f376595257060d0434b8e828e 100644 (file)
--- a/manifests/series8.pp
+++ b/manifests/series8.pp
@@ -1,25 +1,38 @@
 class php::series8(
   $hardened       = true,
   $manage_mod_php = false,
+  $deb_sury_repo  = 'absent',
 ) {
   case $::lsbdistcodename {
     'xenial': {
-      include php::ppa
+      class { 'php::ppa':
+        ensure => $deb_sury_repo,
+      }
     }
     'trusty': {
-      include php::ppa
+      class { 'php::ppa':
+        ensure => $deb_sury_repo,
+      }
     }
     'bookworm': {
-      include php::dpa
+      class { 'php::dpa':
+        ensure => $deb_sury_repo,
+      }
     }
     'bullseye': {
-      include php::dpa
+      class { 'php::dpa':
+        ensure => $deb_sury_repo,
+      }
     }
     'stretch': {
-      include php::dpa
+      class { 'php::dpa':
+        ensure => $deb_sury_repo,
+      }
     }
     'buster': {
-      include php::dpa
+      class { 'php::dpa':
+        ensure => $deb_sury_repo,
+      }
     }
   }