diff options
Diffstat (limited to 'manifests/dpa.pp')
| -rw-r--r-- | manifests/dpa.pp | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/manifests/dpa.pp b/manifests/dpa.pp index 74ba174..d159b36 100644 --- a/manifests/dpa.pp +++ b/manifests/dpa.pp @@ -1,5 +1,14 @@ class php::dpa inherits php::repository { + # Old location file { '/etc/apt/trusted.gpg.d/deb.sury.org-php.gpg': + ensure => absent, + owner => "root", + group => "root", + mode => "0644", + source => 'puppet:///modules/php/deb.sury.org.gpg', + } + + file { '/etc/apt/keyrings/deb.sury.org-php.gpg': ensure => present, owner => "root", group => "root", @@ -8,7 +17,17 @@ class php::dpa inherits php::repository { } File['/etc/apt/sources.list.d/php.list'] { - content => "deb https://packages.sury.org/php/ ${::lsbdistcodename} main\n", - require => File['/etc/apt/trusted.gpg.d/deb.sury.org-php.gpg'], + 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, + owner => "root", + group => "root", + mode => "0644", + source => 'puppet:///modules/php/preferences', } } |