aboutsummaryrefslogtreecommitdiff
path: root/manifests/ppa.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2018-09-14 14:45:46 -0300
committerSilvio Rhatto <rhatto@riseup.net>2018-09-14 14:45:46 -0300
commita393864ac0554b671f6e5d04def839d76c90032c (patch)
tree1608b1e90614f7480c95dd2e47fbe15830a28808 /manifests/ppa.pp
parent0c815b656e93e18f7fb6b72c0be4e51069799abe (diff)
downloadpuppet-php-a393864ac0554b671f6e5d04def839d76c90032c.tar.gz
puppet-php-a393864ac0554b671f6e5d04def839d76c90032c.tar.bz2
Avoid dependency lookup error for /etc/apt/sources.list.d/php.list at php::packages (3)
Diffstat (limited to 'manifests/ppa.pp')
-rw-r--r--manifests/ppa.pp15
1 files changed, 2 insertions, 13 deletions
diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 591844c..2367bf9 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,4 +1,4 @@
-class php::ppa inherits php::packages {
+class php::ppa inherits php::repository {
#package { 'python-software-properties':
# ensure => present,
#}
@@ -20,19 +20,8 @@ class php::ppa inherits php::packages {
notify => Exec['php-apt-auto-update'],
}
- file { '/etc/apt/sources.list.d/php.list':
- ensure => present,
- owner => "root",
- group => "root",
- mode => "0644",
+ 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'],
- notify => Exec['php-apt-auto-update'],
- }
-
- exec { 'php-apt-auto-update':
- command => "/usr/bin/apt-get update",
- user => "root",
- refreshonly => true,
}
}