aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-06-13 17:58:29 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-06-13 17:58:29 -0300
commit015ed988efe22d1c524ed39352edc19fc259ae27 (patch)
treefbf05cbe29afbd1977ebd801a6fed677cedc46e0
parent6d3980ebcd2333c324db326536622c548a5f186a (diff)
downloadpuppet-php-015ed988efe22d1c524ed39352edc19fc259ae27.tar.gz
puppet-php-015ed988efe22d1c524ed39352edc19fc259ae27.tar.bz2
Commented code for ubuntu PPA
-rw-r--r--manifests/packages/xenial.pp27
1 files changed, 22 insertions, 5 deletions
diff --git a/manifests/packages/xenial.pp b/manifests/packages/xenial.pp
index 6c450f3..dbc213a 100644
--- 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