puppet: Separate out some packages needed only by the app servers

(imported from commit 447837f1d5f68d0bf160dec2a9a37fc1cb7e62d5)
This commit is contained in:
Keegan McAllister 2012-12-05 11:16:10 -05:00
parent 72b9f25cbd
commit c34d39caf8
1 changed files with 4 additions and 4 deletions

View File

@ -30,9 +30,8 @@ define common::append ($file, $line) {
class humbug_base { class humbug_base {
$packages = [ "screen", "strace", "vim", "emacs", "git", "python-tz", "sqlite3", "ntp", $packages = [ "screen", "strace", "vim", "emacs", "git", "python-tz", "sqlite3", "ntp",
"python-tornado", "python-simplejson", "python-pygments", "ipython", "host", "python-simplejson", "ipython", "host", "openssh-server", "python-pip",
"python-django", "openssh-server", "python-pip", "puppet-el", "python-flup", "puppet-el", "iptables-persistent", "nagios-plugins-basic", ]
"iptables-persistent", "nagios-plugins-basic", ]
package { $packages: ensure => "installed" } package { $packages: ensure => "installed" }
# FIXME: Stop using pip since it is insecure # FIXME: Stop using pip since it is insecure
@ -201,7 +200,8 @@ class humbug_apache_base {
} }
class humbug_app_frontend { class humbug_app_frontend {
$web_packages = [ "nginx", "memcached", "python-pylibmc", ] $web_packages = [ "nginx", "memcached", "python-pylibmc", "python-tornado", "python-django",
"python-pygments", "python-flup", ]
package { $web_packages: ensure => "installed" } package { $web_packages: ensure => "installed" }
file { "/etc/nginx/nginx.conf": file { "/etc/nginx/nginx.conf":
require => Package[nginx], require => Package[nginx],