diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp index 755a68e..f258785 100644 --- a/modules/rhizo_base/manifests/init.pp +++ b/modules/rhizo_base/manifests/init.pp @@ -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', } - } +} diff --git a/modules/rhizo_base/manifests/packages.pp b/modules/rhizo_base/manifests/packages.pp index d4c083f..6fee5a8 100644 --- a/modules/rhizo_base/manifests/packages.pp +++ b/modules/rhizo_base/manifests/packages.pp @@ -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'], + } + +}