From a393864ac0554b671f6e5d04def839d76c90032c Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 14 Sep 2018 14:45:46 -0300
Subject: Avoid dependency lookup error for /etc/apt/sources.list.d/php.list at
 php::packages (3)

---
 manifests/dpa.pp | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'manifests/dpa.pp')

diff --git a/manifests/dpa.pp b/manifests/dpa.pp
index 619cd0a..74ba174 100644
--- a/manifests/dpa.pp
+++ b/manifests/dpa.pp
@@ -1,4 +1,4 @@
-class php::dpa inherits php::packages {
+class php::dpa inherits php::repository {
   file { '/etc/apt/trusted.gpg.d/deb.sury.org-php.gpg':
     ensure  => present,
     owner   => "root",
@@ -7,19 +7,8 @@ class php::dpa inherits php::packages {
     source  => 'puppet:///modules/php/deb.sury.org.gpg',
   }
 
-  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 https://packages.sury.org/php/ ${::lsbdistcodename} main\n",
     require => File['/etc/apt/trusted.gpg.d/deb.sury.org-php.gpg'],
-    notify  => Exec['php-apt-auto-update'],
-  }
-
-  exec { 'php-apt-auto-update':
-    command     => "/usr/bin/apt-get update",
-    user        => "root",
-    refreshonly => true,
   }
 }
-- 
cgit v1.2.3