Skip to content
Browse files

We don't need Tomcat's admin webapps.

  • Loading branch information...
1 parent 1cc051d commit c3183770dabfb35350eeb4c1b39b6372fa97af23 David Yip committed
Showing with 2 additions and 22 deletions.
  1. +2 −22 chef/cookbooks/tomcat/recipes/default.rb
View
24 chef/cookbooks/tomcat/recipes/default.rb
@@ -18,29 +18,9 @@
#
include_recipe "java"
-include_recipe "openssl"
-# Generate a keystore password for applications running in Tomcat.
-# This is not the same keystore set up in Tomcat connectors. That keystore
-# is used to *provide* HTTPS connections to clients; this keystore is used to
-# *verify* HTTPS connections established by applications in Tomcat.
-include Opscode::OpenSSL::Password
+tomcat_pkgs = ["tomcat6"]
-unless node["tomcat"]["keystore"]["password"]
- keystore_password = secure_password
- node["tomcat"]["keystore"]["password"] = keystore_password
- node.save unless Chef::Config[:solo]
-end
-
-tomcat_pkgs = value_for_platform(
- ["debian","ubuntu"] => {
- "default" => ["tomcat6","tomcat6-admin"]
- },
- ["centos","redhat","fedora"] => {
- "default" => ["tomcat6","tomcat6-admin-webapps"]
- },
- "default" => ["tomcat6"]
-)
tomcat_pkgs.each do |pkg|
package pkg do
action :install
@@ -67,7 +47,7 @@
mode "0644"
notifies :restart, resources(:service => "tomcat")
end
-else
+else
template "/etc/default/tomcat6" do
source "default_tomcat6.erb"
owner "root"

0 comments on commit c318377

Please sign in to comment.
Something went wrong with that request. Please try again.