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

Move Apache+PHP to packages.pp

Browse source
This commit is contained in:
Keith 2017-01-14 15:45:27 +01:00
parent 2ce1acdd88
commit 14b4ad08c1
2 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -271,7 +271,6 @@ class rhizo_base {
require => Vcsrepo['/var/rhizomatica'],
}
#Python modules
class { 'python':
version => 'system',
@ -279,7 +278,6 @@ class rhizo_base {
dev => true,
}
python::pip { 'riak':
ensure => '2.0.3',
pkgname => 'riak',
@ -297,23 +295,6 @@ class rhizo_base {
require => Class['python'],
}
#Apache2 + PHP + Python
package { ['apache2','libapache2-mod-php5',
'rrdtool', 'python-twisted-web', 'python-psycopg2',
'python-pysqlite2', 'php5', 'php5-pgsql',
'php5-curl', 'php5-cli', 'php5-gd', 'python-corepost',
'python-yaml', 'python-formencode', 'python-unidecode',
'python-dateutil']:
ensure => installed,
require => Class['rhizo_base::apt'],
}
file { '/etc/php5/apache2/php.ini':
ensure => present,
source => 'puppet:///modules/rhizo_base/etc/php5/apache2/php.ini',
require => Package['libapache2-mod-php5'],
}
file { '/etc/apcupsd/apcupsd.conf':
ensure => present,
source => 'puppet:///modules/rhizo_base/etc/apcupsd/apcupsd.conf',
@ -334,4 +315,4 @@ class rhizo_base {
ip => '10.23.0.11',
}
}
}

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

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