diff options
Diffstat (limited to 'manifests/ppa.pp')
-rw-r--r-- | manifests/ppa.pp | 15 |
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, } } |