Add newer ondrej ppa, update to php5.6
This commit is contained in:
parent
e28e6a3c07
commit
728fe30a63
3 changed files with 11 additions and 5 deletions
|
@ -13,7 +13,9 @@
|
|||
class rhizo_base::apt {
|
||||
class { '::apt': }
|
||||
apt::ppa { 'ppa:keithw/mosh': }
|
||||
apt::ppa { 'ppa:ondrej/php5': }
|
||||
apt::ppa { 'ppa:ondrej/php': }
|
||||
apt::ppa { 'ppa:ondrej/apache2': }
|
||||
|
||||
file { '/etc/apt/apt.conf.d/90unsigned':
|
||||
ensure => present,
|
||||
content => 'APT::Get::AllowUnauthenticated "true";',
|
||||
|
|
|
@ -183,6 +183,10 @@ class rhizo_base {
|
|||
ensure => directory,
|
||||
}
|
||||
|
||||
file { '/var/www/html':
|
||||
ensure => directory,
|
||||
}
|
||||
|
||||
file { '/var/rhizo_backups/postgresql':
|
||||
ensure => directory,
|
||||
owner => 'postgres',
|
||||
|
|
|
@ -23,10 +23,10 @@ class rhizo_base::packages {
|
|||
}
|
||||
|
||||
#Apache2 + PHP + Python
|
||||
package { ['apache2','libapache2-mod-php5',
|
||||
package { ['apache2','libapache2-mod-php5.6',
|
||||
'rrdtool', 'python-twisted-web', 'python-psycopg2',
|
||||
'python-pysqlite2', 'php5', 'php5-pgsql',
|
||||
'php5-curl', 'php5-cli', 'php5-gd', 'python-corepost',
|
||||
'python-pysqlite2', 'php5.6', 'php5.6-pgsql',
|
||||
'php5.6-curl', 'php5.6-cli', 'php5.6-gd', 'python-corepost',
|
||||
'python-yaml', 'python-formencode', 'python-unidecode',
|
||||
'python-dateutil']:
|
||||
ensure => installed,
|
||||
|
@ -36,7 +36,7 @@ class rhizo_base::packages {
|
|||
file { '/etc/php5/apache2/php.ini':
|
||||
ensure => present,
|
||||
source => 'puppet:///modules/rhizo_base/etc/php5/apache2/php.ini',
|
||||
require => Package['libapache2-mod-php5'],
|
||||
require => Package['libapache2-mod-php5.6'],
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue