From 306f2462cc663568a8bc370aece685ab5b7a2a5e Mon Sep 17 00:00:00 2001 From: Trevor Maglione Date: Mon, 3 Aug 2015 12:52:41 -0700 Subject: [PATCH 1/2] Try to fix a few issues installing PHP --- puppet/modules/php5-fpm/manifests/init.pp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/puppet/modules/php5-fpm/manifests/init.pp b/puppet/modules/php5-fpm/manifests/init.pp index ddd0835..30a9700 100644 --- a/puppet/modules/php5-fpm/manifests/init.pp +++ b/puppet/modules/php5-fpm/manifests/init.pp @@ -1,14 +1,24 @@ class php5-fpm { include apt + package {'software-properties-common': + ensure => present + } + + package {'ca-certificates': + ensure => present + } + apt::key {'ppa:ondrej/php5-5.6': - ensure => present, - server => 'hkp://keyserver.ubuntu.com:80', - id => 'E5267A6C' + ensure => present, + server => 'hkp://keyserver.ubuntu.com:80', + id => 'E5267A6C' } apt::ppa {'ppa:ondrej/php5-5.6': - require => Apt::Key['ppa:ondrej/php5-5.6'] + require => [Apt::Key['ppa:ondrej/php5-5.6'], + Package['software-properties-common'], + Package['ca-certificates']] } package {['php5-fpm', 'php5-cli']: From 947a8205dc437182919c48ce3365ad3cd613d47d Mon Sep 17 00:00:00 2001 From: Trevor Maglione Date: Wed, 5 Aug 2015 13:10:33 -0700 Subject: [PATCH 2/2] Force apt-get update after adding PHP PPA for random 404s --- puppet/modules/php5-fpm/manifests/init.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/puppet/modules/php5-fpm/manifests/init.pp b/puppet/modules/php5-fpm/manifests/init.pp index 30a9700..5d63886 100644 --- a/puppet/modules/php5-fpm/manifests/init.pp +++ b/puppet/modules/php5-fpm/manifests/init.pp @@ -18,7 +18,8 @@ apt::ppa {'ppa:ondrej/php5-5.6': require => [Apt::Key['ppa:ondrej/php5-5.6'], Package['software-properties-common'], - Package['ca-certificates']] + Package['ca-certificates']], + notify => Exec['apt_update'] } package {['php5-fpm', 'php5-cli']: