keith/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add newer ondrej ppa, update to php5.6

Browse source
This commit is contained in:
Wile E. Coyote 2017-01-24 18:02:36 +00:00
parent e28e6a3c07
commit 728fe30a63
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/rhizo_base/manifests/apt.pp
View file

@ -13,7 +13,9 @@
class rhizo_base::apt { class rhizo_base::apt {
class { '::apt': } class { '::apt': }
apt::ppa { 'ppa:keithw/mosh': } 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': file { '/etc/apt/apt.conf.d/90unsigned':
ensure => present, ensure => present,
content => 'APT::Get::AllowUnauthenticated "true";', content => 'APT::Get::AllowUnauthenticated "true";',

4
modules/rhizo_base/manifests/init.pp
View file

@ -183,6 +183,10 @@ class rhizo_base {
ensure => directory, ensure => directory,
} }
file { '/var/www/html':
ensure => directory,
}
file { '/var/rhizo_backups/postgresql': file { '/var/rhizo_backups/postgresql':
ensure => directory, ensure => directory,
owner => 'postgres', owner => 'postgres',

8
modules/rhizo_base/manifests/packages.pp
View file

@ -23,10 +23,10 @@ class rhizo_base::packages {
} }
#Apache2 + PHP + Python #Apache2 + PHP + Python
package { ['apache2','libapache2-mod-php5', package { ['apache2','libapache2-mod-php5.6',
'rrdtool', 'python-twisted-web', 'python-psycopg2', 'rrdtool', 'python-twisted-web', 'python-psycopg2',
'python-pysqlite2', 'php5', 'php5-pgsql', 'python-pysqlite2', 'php5.6', 'php5.6-pgsql',
'php5-curl', 'php5-cli', 'php5-gd', 'python-corepost', 'php5.6-curl', 'php5.6-cli', 'php5.6-gd', 'python-corepost',
'python-yaml', 'python-formencode', 'python-unidecode', 'python-yaml', 'python-formencode', 'python-unidecode',
'python-dateutil']: 'python-dateutil']:
ensure => installed, ensure => installed,
@ -36,7 +36,7 @@ class rhizo_base::packages {
file { '/etc/php5/apache2/php.ini': file { '/etc/php5/apache2/php.ini':
ensure => present, ensure => present,
source => 'puppet:///modules/rhizo_base/etc/php5/apache2/php.ini', source => 'puppet:///modules/rhizo_base/etc/php5/apache2/php.ini',
require => Package['libapache2-mod-php5'], require => Package['libapache2-mod-php5.6'],
} }
} }