diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2024-08-19 10:19:44 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2024-08-19 10:19:44 -0300 |
| commit | 21b9a20b68df81aa61ec0d1ac6e4583cdf82aebf (patch) | |
| tree | 46380cc8f8ec6559df7abe09db9a8cabbcc3d120 | |
| parent | d6784318b80b784d3528a76429b327d375e90796 (diff) | |
| download | puppet-php-21b9a20b68df81aa61ec0d1ac6e4583cdf82aebf.tar.gz puppet-php-21b9a20b68df81aa61ec0d1ac6e4583cdf82aebf.tar.bz2 | |
Fix: use the recommended APT keyrings folder
| -rw-r--r-- | manifests/dpa.pp | 13 | ||||
| -rw-r--r-- | manifests/ppa.pp | 12 |
2 files changed, 22 insertions, 3 deletions
diff --git a/manifests/dpa.pp b/manifests/dpa.pp index 1a69e6c..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,8 +17,8 @@ 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 diff --git a/manifests/ppa.pp b/manifests/ppa.pp index 2367bf9..07e379d 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -11,6 +11,7 @@ class php::ppa inherits php::repository { # require => Package['python-software-properties'], #} + # Old location file { '/etc/apt/trusted.gpg.d/ondrej_ubuntu_php.gpg': ensure => present, owner => "root", @@ -20,8 +21,17 @@ class php::ppa inherits php::repository { notify => Exec['php-apt-auto-update'], } + file { '/etc/apt/keyrings/ondrej_ubuntu_php.gpg': + ensure => present, + 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 http://ppa.launchpad.net/ondrej/php/ubuntu ${::lsbdistcodename} main\n", - require => File['/etc/apt/trusted.gpg.d/ondrej_ubuntu_php.gpg'], + require => File['/etc/apt/keyrings/ondrej_ubuntu_php.gpg'], } } |