Fix up packages
This commit is contained in:
parent
c469f5b91b
commit
ce40606426
2 changed files with 20 additions and 20 deletions
|
@ -17,9 +17,15 @@ class rhizo_base::packages {
|
|||
|
||||
class rhizo_base::packages::common {
|
||||
|
||||
package { [ 'python-python-smpplib' ]:
|
||||
ensure => purged
|
||||
}
|
||||
|
||||
package { ['mosh', 'git', 'openvpn', 'lm-sensors', 'runit', 'sqlite3',
|
||||
'libffi-dev', 'apcupsd', 'expect', 'gawk', 'swig', 'g++',
|
||||
'python-python-smpplib', 'libcdk5' ]:
|
||||
'libcdk5' , 'sngrep', 'rrdtool', 'dnsmasq',
|
||||
'python-unidecode', 'python-dateutil', 'python-yaml', 'python-formencode',
|
||||
'python-smpplib', 'python-psycopg2', 'python-pysqlite2' ]:
|
||||
ensure => installed,
|
||||
require => Class['rhizo_base::apt'],
|
||||
}
|
||||
|
@ -32,13 +38,10 @@ class rhizo_base::packages::ubuntu inherits rhizo_base::packages::common {
|
|||
ensure => '3.8.1-1puppetlabs1',
|
||||
}
|
||||
|
||||
#Apache2 + PHP + Python
|
||||
package { ['apache2','libapache2-mod-php5.6',
|
||||
'rrdtool', 'python-twisted-web', 'python-psycopg2',
|
||||
'python-pysqlite2', 'php5.6', 'php5.6-pgsql',
|
||||
'php5.6-curl', 'php5.6-cli', 'php5.6-gd', 'python-corepost', 'php5.6-xml',
|
||||
'python-yaml', 'python-formencode', 'python-unidecode',
|
||||
'python-dateutil']:
|
||||
#Apache2 + PHP
|
||||
package { ['apache2','libapache2-mod-php5.6', 'php5.6', 'php5.6-pgsql',
|
||||
'php5.6-curl', 'php5.6-cli', 'php5.6-gd', 'php5.6-xml',
|
||||
'python-corepost', 'python-twisted-web' ]:
|
||||
ensure => installed,
|
||||
require => Class['rhizo_base::apt'],
|
||||
}
|
||||
|
@ -53,12 +56,9 @@ class rhizo_base::packages::ubuntu inherits rhizo_base::packages::common {
|
|||
|
||||
class rhizo_base::packages::debian inherits rhizo_base::packages::common {
|
||||
|
||||
package { ['apache2','libapache2-mod-php5',
|
||||
'rrdtool', 'python-psycopg2',
|
||||
'python-pysqlite2', 'php5', 'php5-pgsql',
|
||||
'php5-curl', 'php5-cli', 'php5-gd',
|
||||
'python-yaml', 'python-formencode', 'python-unidecode',
|
||||
'python-dateutil', 'sudo', 'apt-transport-https']:
|
||||
package { ['apache2','libapache2-mod-php5', 'php5', 'php5-pgsql',
|
||||
'php5-curl', 'php5-cli', 'php5-gd',
|
||||
'sudo', 'apt-transport-https']:
|
||||
ensure => installed,
|
||||
require => Class['rhizo_base::apt'],
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue