Commented code for ubuntu PPA

diff --git a/manifests/packages/xenial.pp b/manifests/packages/xenial.pp
index 6c450f39ce2417b12478622b33ef13e9b964fd84..dbc213a4f872169d8387cb1a453bb0205b370445 100644 (file)
--- a/manifests/packages/xenial.pp
+++ b/manifests/packages/xenial.pp
@@ -1,25 +1,42 @@
 class php::packages::xenial {
+  #package { 'python-software-properties':
+  #  ensure => present,
+  #}
+
+  ## TODO: check repository key!
+  #exec { 'add-apt-repository-ondrej-php':
+  #  command => '/usr/bin/add-apt-repository -y ppa:ondrej/php && apt-get update',
+  #  user    => 'root',
+  #  creates => '/etc/apt/sources.list.d/ondrej-ubuntu-php-xenial.list',
+  #  require => Package['python-software-properties'],
+  #}
+
   # The needed packages: we could also try libapache2-mod-php5.6filter
   package { 'php5':
-    name => 'php5.6',
+    name    => 'php5.6',
+    #require => Exec['add-apt-repository-ondrej-php'],
   }
 
   package { 'php5-cli':
-    name => 'php5.6-cli',
+    name    => 'php5.6-cli',
+    #require => Exec['add-apt-repository-ondrej-php'],
   }
 
   package { [ 'php5.6-mysql', 'php5.6-sqlite3', 'php5.6-curl', 'php5.6-gmp', 'libapache2-mod-php5.6' ]:
-    ensure => installed,
+    ensure  => installed,
+    #require => Exec['add-apt-repository-ondrej-php'],
   }
 
   # Optional packages
   package { [ "php5.6-gd", "php-imagick" ]:
-    ensure => installed,
+    ensure  => installed,
+    #require => Exec['add-apt-repository-ondrej-php'],
   }
 
   # Not available anymore
   package { 'php5.6-suhosin':
-    ensure => absent,
+    ensure  => absent,
+    #require => Exec['add-apt-repository-ondrej-php'],
   }
 
   # The needed apache modules