Return-Path: X-Original-To: apmail-climate-commits-archive@minotaur.apache.org Delivered-To: apmail-climate-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 967E510EFD for ; Thu, 31 Oct 2013 15:02:58 +0000 (UTC) Received: (qmail 28336 invoked by uid 500); 31 Oct 2013 15:02:00 -0000 Delivered-To: apmail-climate-commits-archive@climate.apache.org Received: (qmail 28040 invoked by uid 500); 31 Oct 2013 15:01:43 -0000 Mailing-List: contact commits-help@climate.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@climate.incubator.apache.org Delivered-To: mailing list commits@climate.incubator.apache.org Received: (qmail 27889 invoked by uid 99); 31 Oct 2013 15:01:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Oct 2013 15:01:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Oct 2013 15:01:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 567D42388C9A; Thu, 31 Oct 2013 15:00:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1537520 [25/34] - in /incubator/climate/branches/rcmet-2.1.2: ./ src/ src/main/ src/main/python/ src/main/python/bin/ src/main/python/docs/ src/main/python/docs/_static/ src/main/python/docs/_templates/ src/main/python/rcmes/ src/main/pyth... Date: Thu, 31 Oct 2013 14:59:54 -0000 To: commits@climate.incubator.apache.org From: pramirez@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131031150009.567D42388C9A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_deflate.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_deflate.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_deflate.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_deflate.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,22 @@ +# +# Cookbook Name:: apache2 +# Recipe:: deflate +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "deflate" do + conf true +end Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_deflate.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_dir.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_dir.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_dir.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_dir.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,22 @@ +# +# Cookbook Name:: apache2 +# Recipe:: dir +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "dir" do + conf true +end Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_dir.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_env.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_env.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_env.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_env.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,20 @@ +# +# Cookbook Name:: apache2 +# Recipe:: env +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "env" Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_env.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_expires.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_expires.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_expires.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_expires.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,20 @@ +# +# Cookbook Name:: apache2 +# Recipe:: expires +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "expires" Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_expires.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_fcgid.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_fcgid.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_fcgid.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_fcgid.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,46 @@ +# +# Cookbook Name:: apache2 +# Recipe:: fcgid +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +if platform?("debian", "ubuntu") + package "libapache2-mod-fcgid" +elsif platform?("centos", "redhat", "fedora") + package "mod_fcgid" do + notifies :run, resources(:execute => "generate-module-list"), :immediately + end + + file "#{node[:apache][:dir]}/conf.d/fcgid.conf" do + action :delete + backup false + end +elsif platform?("suse") + apache_lib_path = node[:architecture] == "i386" ? "/usr/lib/httpd" : "/usr/lib64/httpd" + package "httpd-devel" + bash "install-fcgid" do + code <<-EOH +(cd /tmp; wget http://superb-east.dl.sourceforge.net/sourceforge/mod-fcgid/mod_fcgid.2.2.tgz) +(cd /tmp; tar zxvf mod_fcgid.2.2.tgz) +(cd /tmp; perl -pi -e 's!/usr/local/apache2!#{apache_lib_path}!g' ./mod_fcgid.2.2/Makefile) +(cd /tmp/mod_fcgid.2.2; make install) +EOH + end +end + +apache_module "fcgid" do + conf true +end Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_fcgid.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_headers.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_headers.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_headers.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_headers.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,20 @@ +# +# Cookbook Name:: apache2 +# Recipe:: headers +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "headers" Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_headers.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_ldap.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_ldap.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_ldap.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_ldap.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,20 @@ +# +# Cookbook Name:: apache2 +# Recipe:: ldap +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "ldap" Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_ldap.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_log_config.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_log_config.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_log_config.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_log_config.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,24 @@ +# +# Cookbook Name:: apache2 +# Recipe:: log_config +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +if platform?("centos", "redhat", "fedora", "suse") + apache_module "log_config" +else + include_recipe "apache2" +end Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_log_config.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_mime.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_mime.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_mime.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_mime.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,22 @@ +# +# Cookbook Name:: apache2 +# Recipe:: mime +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "mime" do + conf true +end Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_mime.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_negotiation.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_negotiation.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_negotiation.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_negotiation.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,22 @@ +# +# Cookbook Name:: apache2 +# Recipe:: negotiation +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "negotiation" do + conf true +end Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_negotiation.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_php5.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_php5.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_php5.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_php5.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,32 @@ +# +# Cookbook Name:: apache2 +# Recipe:: php5 +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +case node[:platform] +when "debian", "ubuntu" + package "libapache2-mod-php5" do + action :install + end +when "centos", "redhat", "fedora" + package "php" do + action :install + notifies :run, resources(:execute => "generate-module-list"), :immediately + end +end + +apache_module "php5" Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_php5.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,22 @@ +# +# Cookbook Name:: apache2 +# Recipe:: proxy +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "proxy" do + conf true +end Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_ajp.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_ajp.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_ajp.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_ajp.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,20 @@ +# +# Cookbook Name:: apache2 +# Recipe:: proxy +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "proxy_ajp" Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_ajp.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_balancer.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_balancer.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_balancer.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_balancer.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,20 @@ +# +# Cookbook Name:: apache2 +# Recipe:: proxy +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "proxy_balancer" Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_balancer.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_connect.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_connect.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_connect.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_connect.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,20 @@ +# +# Cookbook Name:: apache2 +# Recipe:: proxy +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "proxy_connect" Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_connect.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_http.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_http.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_http.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_http.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,20 @@ +# +# Cookbook Name:: apache2 +# Recipe:: proxy_http +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "proxy_http" Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_proxy_http.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_python.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_python.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_python.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_python.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,22 @@ +# +# Cookbook Name:: apache2 +# Recipe:: python +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +package "libapache2-mod-python" + +apache_module "python" Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_python.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_rewrite.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_rewrite.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_rewrite.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_rewrite.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,20 @@ +# +# Cookbook Name:: apache2 +# Recipe:: rewrite +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "rewrite" Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_rewrite.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_setenvif.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_setenvif.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_setenvif.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_setenvif.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,22 @@ +# +# Cookbook Name:: apache2 +# Recipe:: setenvif +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "setenvif" do + conf true +end Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_setenvif.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_ssl.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_ssl.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_ssl.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_ssl.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,42 @@ +# +# Cookbook Name:: apache2 +# Recipe:: ssl +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +if platform?("centos", "redhat", "fedora") + package "mod_ssl" do + action :install + notifies :run, resources(:execute => "generate-module-list"), :immediately + end + + file "#{node[:apache][:dir]}/conf.d/ssl.conf" do + action :delete + backup false + end +end + +ports = node[:apache][:listen_ports].include?("443") ? node[:apache][:listen_ports] : [node[:apache][:listen_ports], "443"].flatten + +template "#{node[:apache][:dir]}/ports.conf" do + source "ports.conf.erb" + variables :apache_listen_ports => ports + notifies :restart, resources(:service => "apache2") +end + +apache_module "ssl" do + conf true +end Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_ssl.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_status.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_status.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_status.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_status.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,22 @@ +# +# Cookbook Name:: apache2 +# Recipe:: status +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apache_module "status" do + conf true +end Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_status.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_wsgi.rb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_wsgi.rb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_wsgi.rb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_wsgi.rb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,27 @@ +# +# Cookbook Name:: apache2 +# Recipe:: python +# +# Copyright 2008-2009, Opscode, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +case node[:platform] +when "debian","ubuntu" + package "libapache2-mod-wsgi" +when "redhat","centos","fedora" + package "mod_wsgi" +end + +apache_module "wsgi" Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/recipes/mod_wsgi.rb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2dismod.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2dismod.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2dismod.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2dismod.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,22 @@ +#!/bin/sh -e + +SYSCONFDIR='<%= node[:apache][:dir] %>' + +if [ -z $1 ]; then + echo "Which module would you like to disable?" + echo -n "Your choices are: " + ls $SYSCONFDIR/mods-enabled/*.load | \ + sed -e "s,$SYSCONFDIR/mods-enabled/,,g" | sed -e 's/\.load$//g;' | xargs echo + echo -n "Module name? " + read MODNAME +else + MODNAME=$1 +fi + +if ! [ -e $SYSCONFDIR/mods-enabled/$MODNAME.load ]; then + echo "This module is already disabled, or does not exist!" + exit 1 +fi + +rm -f $SYSCONFDIR/mods-enabled/$MODNAME.* +echo "Module $MODNAME disabled; reload apache to fully disable." \ No newline at end of file Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2dismod.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2dissite.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2dissite.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2dissite.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2dissite.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,29 @@ +#!/bin/sh -e + +SYSCONFDIR='<%= node[:apache][:dir] %>' + +if [ -z $1 ]; then + echo "Which site would you like to disable?" + echo -n "Your choices are: " + ls $node[:apache][:dir]/sites-enabled/* | \ + sed -e "s,$SYSCONFDIR/sites-enabled/,,g" | xargs echo + echo -n "Site name? " + read SITENAME +else + SITENAME=$1 +fi + +if [ $SITENAME = "default" ]; then + PRIORITY="000" +fi + +if ! [ -e $SYSCONFDIR/sites-enabled/$SITENAME -o \ + -e $SYSCONFDIR/sites-enabled/"$PRIORITY"-"$SITENAME" ]; then + echo "This site is already disabled, or does not exist!" + exit 1 +fi + +if ! rm $SYSCONFDIR/sites-enabled/$SITENAME 2>/dev/null; then + rm -f $SYSCONFDIR/sites-enabled/"$PRIORITY"-"$SITENAME" +fi +echo "Site $SITENAME disabled; reload apache to disable." \ No newline at end of file Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2dissite.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2enmod.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2enmod.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2enmod.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2enmod.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,37 @@ +#!/bin/sh -e + +SYSCONFDIR='<%= node[:apache][:dir] %>' + +if [ -z $1 ]; then + echo "Which module would you like to enable?" + echo -n "Your choices are: " + ls $SYSCONFDIR/mods-available/*.load | \ + sed -e "s,$SYSCONFDIR/mods-available/,,g" | sed -e 's/\.load$//g;' | xargs echo + echo -n "Module name? " + read MODNAME +else + MODNAME=$1 +fi + +#figure out if we're on a prefork or threaded mpm +if [ -x /usr/sbin/apache2 ]; then + PREFORK=`/usr/sbin/apache2 -l | grep prefork || true` +fi + +if [ -e $SYSCONFDIR/mods-enabled/$MODNAME.load && -e $SYSCONFDIR/mods-enabled/$MODNAME.conf ]; then + echo "This module is already enabled!" + exit 0 +fi + +if ! [ -e $SYSCONFDIR/mods-available/$MODNAME.load ]; then + echo "This module does not exist!" + exit 1 +fi + +for i in conf load; do + if [ -e $SYSCONFDIR/mods-available/$MODNAME.$i -a ! -e $SYSCONFDIR/mods-enabled/$MODNAME.$i ]; then + ln -sf $SYSCONFDIR/mods-available/$MODNAME.$i $SYSCONFDIR/mods-enabled/$MODNAME.$i; + fi +done + +echo "Module $MODNAME installed; reload apache to enable." \ No newline at end of file Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2enmod.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2ensite.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2ensite.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2ensite.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2ensite.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,38 @@ +#!/bin/sh -e + +SYSCONFDIR='<%= node[:apache][:dir] %>' + +if [ -z $1 ]; then + echo "Which site would you like to enable?" + echo -n "Your choices are: " + ls $SYSCONFDIR/sites-available/* | \ + sed -e "s,$SYSCONFDIR/sites-available/,,g" | xargs echo + echo -n "Site name? " + read SITENAME +else + SITENAME=$1 +fi + +if [ $SITENAME = "default" ]; then + PRIORITY="000" +fi + +if [ -e $SYSCONFDIR/sites-enabled/$SITENAME -o \ + -e $SYSCONFDIR/sites-enabled/"$PRIORITY"-"$SITENAME" ]; then + echo "This site is already enabled!" + exit 0 +fi + +if ! [ -e $SYSCONFDIR/sites-available/$SITENAME ]; then + echo "This site does not exist!" + exit 1 +fi + +if [ $SITENAME = "default" ]; then + ln -sf $SYSCONFDIR/sites-available/$SITENAME \ + $SYSCONFDIR/sites-enabled/"$PRIORITY"-"$SITENAME" +else + ln -sf $SYSCONFDIR/sites-available/$SITENAME $SYSCONFDIR/sites-enabled/$SITENAME +fi + +echo "Site $SITENAME installed; reload apache to enable." \ No newline at end of file Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/a2ensite.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/apache2.conf.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/apache2.conf.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/apache2.conf.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/apache2.conf.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,230 @@ +# +# Generated by Chef +# +# Based on the Ubuntu apache2.conf + +ServerRoot "<%= node[:apache][:dir] %>" + +# +# The accept serialization lock file MUST BE STORED ON A LOCAL DISK. +# +<% if node[:platform] == "debian" || node[:platform] == "ubuntu" -%> +LockFile /var/lock/apache2/accept.lock +<% else %> +LockFile logs/accept.lock +<% end -%> + +# +# PidFile: The file in which the server should record its process +# identification number when it starts. +# +<% if node[:platform] == "debian" || node[:platform] == "ubuntu" -%> +PidFile /var/run/apache2.pid +<% elsif node[:platform] == "centos" || node[:platform] == "redhat" || node[:platform] == "fedora" -%> +PidFile /var/run/httpd.pid +<% else -%> +PidFile logs/httpd.pid +<% end -%> + +# +# Timeout: The number of seconds before receives and sends time out. +# +Timeout <%= node[:apache][:timeout] %> + +# +# KeepAlive: Whether or not to allow persistent connections (more than +# one request per connection). Set to "Off" to deactivate. +# +KeepAlive <%= node[:apache][:keepalive] %> + +# +# MaxKeepAliveRequests: The maximum number of requests to allow +# during a persistent connection. Set to 0 to allow an unlimited amount. +# We recommend you leave this number high, for maximum performance. +# +MaxKeepAliveRequests <%= node[:apache][:keepaliverequests] %> + +# +# KeepAliveTimeout: Number of seconds to wait for the next request from the +# same client on the same connection. +# +KeepAliveTimeout <%= node[:apache][:keepalivetimeout] %> + +## +## Server-Pool Size Regulation (MPM specific) +## + +# prefork MPM +# StartServers: number of server processes to start +# MinSpareServers: minimum number of server processes which are kept spare +# MaxSpareServers: maximum number of server processes which are kept spare +# MaxClients: maximum number of server processes allowed to start +# MaxRequestsPerChild: maximum number of requests a server process serves + + StartServers <%= node[:apache][:prefork][:startservers] %> + MinSpareServers <%= node[:apache][:prefork][:minspareservers] %> + MaxSpareServers <%= node[:apache][:prefork][:maxspareservers] %> + ServerLimit <%= node[:apache][:prefork][:serverlimit] %> + MaxClients <%= node[:apache][:prefork][:maxclients] %> + MaxRequestsPerChild <%= node[:apache][:prefork][:maxrequestsperchild] %> + + +# worker MPM +# StartServers: initial number of server processes to start +# MaxClients: maximum number of simultaneous client connections +# MinSpareThreads: minimum number of worker threads which are kept spare +# MaxSpareThreads: maximum number of worker threads which are kept spare +# ThreadsPerChild: constant number of worker threads in each server process +# MaxRequestsPerChild: maximum number of requests a server process serves + + StartServers <%= node[:apache][:worker][:startservers] %> + MaxClients <%= node[:apache][:worker][:maxclients] %> + MinSpareThreads <%= node[:apache][:worker][:minsparethreads] %> + MaxSpareThreads <%= node[:apache][:worker][:maxsparethreads] %> + ThreadsPerChild <%= node[:apache][:worker][:threadsperchild] %> + MaxRequestsPerChild <%= node[:apache][:worker][:maxrequestsperchild] %> + + +User <%= node[:apache][:user] %> +Group <%= node[:apache][:user] %> + +# +# AccessFileName: The name of the file to look for in each directory +# for additional configuration directives. See also the AllowOverride +# directive. +# + +AccessFileName .htaccess + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Order allow,deny + Deny from all + + +# +# DefaultType is the default MIME type the server will use for a document +# if it cannot otherwise determine one, such as from filename extensions. +# If your server contains mostly text or HTML documents, "text/plain" is +# a good value. If most of your content is binary, such as applications +# or images, you may want to use "application/octet-stream" instead to +# keep browsers from trying to display binary files as though they are +# text. +# +DefaultType text/plain + + +# +# HostnameLookups: Log the names of clients or just their IP addresses +# e.g., www.apache.org (on) or 204.62.129.132 (off). +# The default is off because it'd be overall better for the net if people +# had to knowingly turn this feature on, since enabling it means that +# each client request will result in AT LEAST one lookup request to the +# nameserver. +# +HostnameLookups Off + +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog <%= node[:apache][:log_dir] %>/error.log + +# +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +# +LogLevel warn + +# Include module configuration: +Include <%= node[:apache][:dir] %>/mods-enabled/*.load +Include <%= node[:apache][:dir] %>/mods-enabled/*.conf + +# Include ports listing +Include <%= node[:apache][:dir] %>/ports.conf + +# +# The following directives define some format nicknames for use with +# a CustomLog directive (see below). +# +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent +# + +# Customizable error responses come in three flavors: +# 1) plain text 2) local redirects 3) external redirects +# +# Some examples: +#ErrorDocument 500 "The server made a boo boo." +#ErrorDocument 404 /missing.html +#ErrorDocument 404 "/cgi-bin/missing_handler.pl" +#ErrorDocument 402 http://www.example.com/subscription_info.html +# + +# +# Putting this all together, we can internationalize error responses. +# +# We use Alias to redirect any /error/HTTP_.html.var response to +# our collection of by-error message multi-language collections. We use +# includes to substitute the appropriate text. +# +# You can modify the messages' appearance without changing any of the +# default HTTP_.html.var files by adding the line: +# +# Alias /error/include/ "/your/include/path/" +# +# which allows you to create your own set of files by starting with the +# /usr/share/apache2/error/include/ files and copying them to /your/include/path/, +# even on a per-VirtualHost basis. The default include files will display +# your Apache version number and your ServerAdmin email address regardless +# of the setting of ServerSignature. +# +# The internationalized error documents require mod_alias, mod_include +# and mod_negotiation. To activate them, uncomment the following 30 lines. + +# Alias /error/ "/usr/share/apache2/error/" +# +# +# AllowOverride None +# Options IncludesNoExec +# AddOutputFilter Includes html +# AddHandler type-map var +# Order allow,deny +# Allow from all +# LanguagePriority en cs de es fr it nl sv pt-br ro +# ForceLanguagePriority Prefer Fallback +# +# +# ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var +# ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var +# ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var +# ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var +# ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var +# ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var +# ErrorDocument 410 /error/HTTP_GONE.html.var +# ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var +# ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var +# ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var +# ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var +# ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var +# ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var +# ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var +# ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var +# ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var +# ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var + + + +# Include generic snippets of statements +Include <%= node[:apache][:dir] %>/conf.d/ + +# Include the virtual host configurations: +Include <%= node[:apache][:dir] %>/sites-enabled/ Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/apache2.conf.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/apache2.god.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/apache2.god.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/apache2.god.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/apache2.god.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,19 @@ +God.watch do |w| + w.name = "apache2" + w.interval = 30.seconds # default + w.start = "<%= @params[:start] %>" + w.stop = "/etc/init.d/httpd stop" + w.restart = "<%= @params[:restart] %>" + w.start_grace = 10.seconds + w.restart_grace = 10.seconds + w.pid_file = "/var/run/httpd.pid" + w.behavior(:clean_pid_file) + + w.start_if do |start| + start.condition(:process_running) do |c| + c.interval = 5.seconds + c.running = false + c.notify = 'admin' + end + end +end Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/apache2.god.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/charset.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/charset.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/charset.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/charset.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,6 @@ +# Read the documentation before enabling AddDefaultCharset. +# In general, it is only a good idea if you know that all your files +# have this encoding. It will override any encoding given in the files +# in meta http-equiv or xml encoding tags. + +#AddDefaultCharset UTF-8 Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/charset.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/default-site.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/default-site.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/default-site.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/default-site.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,57 @@ + + ServerAdmin <%= node[:apache][:contact] %> + + DocumentRoot /var/www/ + + Options FollowSymLinks + AllowOverride None + + + Options Indexes FollowSymLinks MultiViews + AllowOverride None + Order allow,deny + allow from all + # This directive allows us to have apache2's default start page + # in /apache2-default/, but still have / go to the right place + #RedirectMatch ^/$ /apache2-default/ + + + ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ + + AllowOverride None + Options ExecCGI -MultiViews +SymLinksIfOwnerMatch + Order allow,deny + Allow from all + + + ErrorLog <%= node[:apache][:log_dir] %>/error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog <%= node[:apache][:log_dir] %>/access.log combined + ServerSignature On + + Alias /doc/ "/usr/share/doc/" + + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Order deny,allow + Deny from all + Allow from 127.0.0.0/255.0.0.0 ::1/128 + + + <% if node[:platform] == "centos" || node[:platform] == "redhat" || node[:platform] == "fedora" -%> + # + # This configuration file enables the default "Welcome" + # page if there is no default index page present for + # the root URL. To disable the Welcome page, comment + # out all the lines below. + # + + Options -Indexes + ErrorDocument 403 /error/noindex.html + + <% end -%> + Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/default-site.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mod_auth_openid.rb.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mod_auth_openid.rb.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mod_auth_openid.rb.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mod_auth_openid.rb.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,12 @@ +#!/usr/bin/env ruby + +allowed_openids = Array.new +<% node[:apache][:allowed_openids].each do |id| -%> +allowed_openids << "<%= id %>" +<% end -%> + +if allowed_openids.grep(ARGV[0]).length > 0 + exit 0 +else + exit 1 +end Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mod_auth_openid.rb.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/README URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/README?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/README (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/README Thu Oct 31 14:59:48 2013 @@ -0,0 +1,2 @@ +These configs are taken from a Debian apache2.2-common 2.2.11-3 install. They +work on CentOS 5.3 with a few conditions using erb. Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/README ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/alias.conf.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/alias.conf.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/alias.conf.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/alias.conf.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,24 @@ + +# +# Aliases: Add here as many aliases as you need (with no limit). The format is +# Alias fakename realname +# +# Note that if you include a trailing / on fakename then the server will +# require it to be present in the URL. So "/icons" isn't aliased in this +# example, only "/icons/". If the fakename is slash-terminated, then the +# realname must also be slash terminated, and if the fakename omits the +# trailing slash, the realname must also omit it. +# +# We include the /icons/ alias for FancyIndexed directory listings. If +# you do not use FancyIndexing, you may comment this out. +# +Alias /icons/ "<%= node[:apache][:icondir] %>" + +"> + Options Indexes MultiViews + AllowOverride None + Order allow,deny + Allow from all + + + Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/alias.conf.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/authopenid.load.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/authopenid.load.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/authopenid.load.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/authopenid.load.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1 @@ +LoadModule authopenid_module /usr/lib/apache2/modules/mod_auth_openid.so Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/authopenid.load.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/autoindex.conf.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/autoindex.conf.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/autoindex.conf.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/autoindex.conf.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,101 @@ + +# +# Directives controlling the display of server-generated directory listings. +# + +# +# IndexOptions: Controls the appearance of server-generated directory +# listings. +# Remove/replace the "Charset=UTF-8" if you don't use UTF-8 for your filenames. +# +IndexOptions FancyIndexing VersionSort HTMLTable NameWidth=* DescriptionWidth=* Charset=UTF-8 + +# +# AddIcon* directives tell the server which icon to show for different +# files or filename extensions. These are only displayed for +# FancyIndexed directories. +# +AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip x-bzip2 + +AddIconByType (TXT,/icons/text.gif) text/* +AddIconByType (IMG,/icons/image2.gif) image/* +AddIconByType (SND,/icons/sound2.gif) audio/* +AddIconByType (VID,/icons/movie.gif) video/* + +AddIcon /icons/binary.gif .bin .exe +AddIcon /icons/binhex.gif .hqx +AddIcon /icons/tar.gif .tar +AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv +AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip +AddIcon /icons/a.gif .ps .ai .eps +AddIcon /icons/layout.gif .html .shtml .htm .pdf +AddIcon /icons/text.gif .txt +AddIcon /icons/c.gif .c +AddIcon /icons/p.gif .pl .py +AddIcon /icons/f.gif .for +AddIcon /icons/dvi.gif .dvi +AddIcon /icons/uuencoded.gif .uu +AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl +AddIcon /icons/tex.gif .tex +# It's a suffix rule, so simply matching "core" matches "score" as well ! +AddIcon /icons/bomb.gif /core +AddIcon (SND,/icons/sound2.gif) .ogg +AddIcon (VID,/icons/movie.gif) .ogm + +AddIcon /icons/back.gif .. +AddIcon /icons/hand.right.gif README +AddIcon /icons/folder.gif ^^DIRECTORY^^ +AddIcon /icons/blank.gif ^^BLANKICON^^ + +# Default icons for OpenDocument format +AddIcon /icons/odf6odt-20x22.png .odt +AddIcon /icons/odf6ods-20x22.png .ods +AddIcon /icons/odf6odp-20x22.png .odp +AddIcon /icons/odf6odg-20x22.png .odg +AddIcon /icons/odf6odc-20x22.png .odc +AddIcon /icons/odf6odf-20x22.png .odf +AddIcon /icons/odf6odb-20x22.png .odb +AddIcon /icons/odf6odi-20x22.png .odi +AddIcon /icons/odf6odm-20x22.png .odm + +AddIcon /icons/odf6ott-20x22.png .ott +AddIcon /icons/odf6ots-20x22.png .ots +AddIcon /icons/odf6otp-20x22.png .otp +AddIcon /icons/odf6otg-20x22.png .otg +AddIcon /icons/odf6otc-20x22.png .otc +AddIcon /icons/odf6otf-20x22.png .otf +AddIcon /icons/odf6oti-20x22.png .oti +AddIcon /icons/odf6oth-20x22.png .oth + +# +# DefaultIcon is which icon to show for files which do not have an icon +# explicitly set. +# +DefaultIcon /icons/unknown.gif + +# +# AddDescription allows you to place a short description after a file in +# server-generated indexes. These are only displayed for FancyIndexed +# directories. +# Format: AddDescription "description" filename +# +#AddDescription "GZIP compressed document" .gz +#AddDescription "tar archive" .tar +#AddDescription "GZIP compressed tar archive" .tgz + +# +# ReadmeName is the name of the README file the server will look for by +# default, and append to directory listings. +# +# HeaderName is the name of a file which should be prepended to +# directory indexes. +ReadmeName README.html +HeaderName HEADER.html + +# +# IndexIgnore is a set of filenames which directory indexing should ignore +# and not include in the listing. Shell-style wildcarding is permitted. +# +IndexIgnore .??* *~ *# RCS CVS *,v *,t + + Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/autoindex.conf.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/deflate.conf.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/deflate.conf.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/deflate.conf.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/deflate.conf.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,16 @@ + + AddOutputFilterByType DEFLATE text/html + AddOutputFilterByType DEFLATE text/css + AddOutputFilterByType DEFLATE text/plain + AddOutputFilterByType DEFLATE text/xml + AddOutputFilterByType DEFLATE application/xhtml+xml + AddOutputFilterByType DEFLATE application/xml + AddOutputFilterByType DEFLATE image/svg+xml + AddOutputFilterByType DEFLATE application/rss+xml + AddOutputFilterByType DEFLATE application/atom_xml + AddOutputFilterByType DEFLATE application/javascript + AddOutputFilterByType DEFLATE application/x-javascript + AddOutputFilterByType DEFLATE application/x-httpd-php + AddOutputFilterByType DEFLATE application/x-httpd-fastphp + AddOutputFilterByType DEFLATE application/x-httpd-eruby + Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/deflate.conf.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/dir.conf.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/dir.conf.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/dir.conf.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/dir.conf.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,5 @@ + + + DirectoryIndex index.html index.cgi index.pl index.php index.xhtml index.htm + + Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/dir.conf.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/fcgid.conf.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/fcgid.conf.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/fcgid.conf.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/fcgid.conf.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,10 @@ + + AddHandler fcgid-script .fcgi + IPCConnectTimeout 20 + + +<% if node[:platform] == "centos" || node[:platform] == "redhat" || node[:platform] == "fedora" -%> +# Sane place to put sockets and shared memory file +SocketPath run/mod_fcgid +SharememPath run/mod_fcgid/fcgid_shm +<% end -%> Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/fcgid.conf.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/mime.conf.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/mime.conf.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/mime.conf.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/mime.conf.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,191 @@ + + +# +# TypesConfig points to the file containing the list of mappings from +# filename extension to MIME-type. +# +TypesConfig /etc/mime.types + +# +# AddType allows you to add to or override the MIME configuration +# file mime.types for specific file types. +# +#AddType application/x-gzip .tgz +# +# AddEncoding allows you to have certain browsers uncompress +# information on the fly. Note: Not all browsers support this. +# Despite the name similarity, the following Add* directives have +# nothing to do with the FancyIndexing customization directives above. +# +#AddEncoding x-compress .Z +#AddEncoding x-gzip .gz .tgz +#AddEncoding x-bzip2 .bz2 +# +# If the AddEncoding directives above are commented-out, then you +# probably should define those extensions to indicate media types: +# +AddType application/x-compress .Z +AddType application/x-gzip .gz .tgz +AddType application/x-bzip2 .bz2 + +# +# DefaultLanguage and AddLanguage allows you to specify the language of +# a document. You can then use content negotiation to give a browser a +# file in a language the user can understand. +# +# Specify a default language. This means that all data +# going out without a specific language tag (see below) will +# be marked with this one. You probably do NOT want to set +# this unless you are sure it is correct for all cases. +# +# * It is generally better to not mark a page as +# * being a certain language than marking it with the wrong +# * language! +# +# DefaultLanguage nl +# +# Note 1: The suffix does not have to be the same as the language +# keyword --- those with documents in Polish (whose net-standard +# language code is pl) may wish to use "AddLanguage pl .po" to +# avoid the ambiguity with the common suffix for perl scripts. +# +# Note 2: The example entries below illustrate that in some cases +# the two character 'Language' abbreviation is not identical to +# the two character 'Country' code for its country, +# E.g. 'Danmark/dk' versus 'Danish/da'. +# +# Note 3: In the case of 'ltz' we violate the RFC by using a three char +# specifier. There is 'work in progress' to fix this and get +# the reference data for rfc1766 cleaned up. +# +# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl) +# English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de) +# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja) +# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn) +# Norwegian (no) - Polish (pl) - Portugese (pt) +# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv) +# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW) +# +AddLanguage ca .ca +AddLanguage cs .cz .cs +AddLanguage da .dk +AddLanguage de .de +AddLanguage el .el +AddLanguage en .en +AddLanguage eo .eo +# See README.Debian for Spanish +AddLanguage es .es +AddLanguage et .et +AddLanguage fr .fr +AddLanguage he .he +AddLanguage hr .hr +AddLanguage it .it +AddLanguage ja .ja +AddLanguage ko .ko +AddLanguage ltz .ltz +AddLanguage nl .nl +AddLanguage nn .nn +AddLanguage no .no +AddLanguage pl .po +AddLanguage pt .pt +AddLanguage pt-BR .pt-br +AddLanguage ru .ru +AddLanguage sv .sv +# See README.Debian for Turkish +AddLanguage tr .tr +AddLanguage zh-CN .zh-cn +AddLanguage zh-TW .zh-tw + +# +# Commonly used filename extensions to character sets. You probably +# want to avoid clashes with the language extensions, unless you +# are good at carefully testing your setup after each change. +# See http://www.iana.org/assignments/character-sets for the +# official list of charset names and their respective RFCs. +# +AddCharset us-ascii .ascii .us-ascii +AddCharset ISO-8859-1 .iso8859-1 .latin1 +AddCharset ISO-8859-2 .iso8859-2 .latin2 .cen +AddCharset ISO-8859-3 .iso8859-3 .latin3 +AddCharset ISO-8859-4 .iso8859-4 .latin4 +AddCharset ISO-8859-5 .iso8859-5 .cyr .iso-ru +AddCharset ISO-8859-6 .iso8859-6 .arb .arabic +AddCharset ISO-8859-7 .iso8859-7 .grk .greek +AddCharset ISO-8859-8 .iso8859-8 .heb .hebrew +AddCharset ISO-8859-9 .iso8859-9 .latin5 .trk +AddCharset ISO-8859-10 .iso8859-10 .latin6 +AddCharset ISO-8859-13 .iso8859-13 +AddCharset ISO-8859-14 .iso8859-14 .latin8 +AddCharset ISO-8859-15 .iso8859-15 .latin9 +AddCharset ISO-8859-16 .iso8859-16 .latin10 +AddCharset ISO-2022-JP .iso2022-jp .jis +AddCharset ISO-2022-KR .iso2022-kr .kis +AddCharset ISO-2022-CN .iso2022-cn .cis +AddCharset Big5 .Big5 .big5 .b5 +AddCharset cn-Big5 .cn-big5 +# For russian, more than one charset is used (depends on client, mostly): +AddCharset WINDOWS-1251 .cp-1251 .win-1251 +AddCharset CP866 .cp866 +AddCharset KOI8 .koi8 +AddCharset KOI8-E .koi8-e +AddCharset KOI8-r .koi8-r .koi8-ru +AddCharset KOI8-U .koi8-u +AddCharset KOI8-ru .koi8-uk .ua +AddCharset ISO-10646-UCS-2 .ucs2 +AddCharset ISO-10646-UCS-4 .ucs4 +AddCharset UTF-7 .utf7 +AddCharset UTF-8 .utf8 +AddCharset UTF-16 .utf16 +AddCharset UTF-16BE .utf16be +AddCharset UTF-16LE .utf16le +AddCharset UTF-32 .utf32 +AddCharset UTF-32BE .utf32be +AddCharset UTF-32LE .utf32le +AddCharset euc-cn .euc-cn +AddCharset euc-gb .euc-gb +AddCharset euc-jp .euc-jp +AddCharset euc-kr .euc-kr +#Not sure how euc-tw got in - IANA doesn't list it??? +AddCharset EUC-TW .euc-tw +AddCharset gb2312 .gb2312 .gb +AddCharset iso-10646-ucs-2 .ucs-2 .iso-10646-ucs-2 +AddCharset iso-10646-ucs-4 .ucs-4 .iso-10646-ucs-4 +AddCharset shift_jis .shift_jis .sjis + +# +# AddHandler allows you to map certain file extensions to "handlers": +# actions unrelated to filetype. These can be either built into the server +# or added with the Action directive (see below) +# +# To use CGI scripts outside of ScriptAliased directories: +# (You will also need to add "ExecCGI" to the "Options" directive.) +# +#AddHandler cgi-script .cgi + +# +# For files that include their own HTTP headers: +# +#AddHandler send-as-is asis + +# +# For server-parsed imagemap files: +# +#AddHandler imap-file map + +# +# For type maps (negotiated resources): +# (This is enabled by default to allow the Apache "It Worked" page +# to be distributed in multiple languages.) +# +AddHandler type-map var + +# +# Filters allow you to process content before it is sent to the client. +# +# To parse .shtml files for server-side includes (SSI): +# (You will also need to add "Includes" to the "Options" directive.) +# +AddType text/html .shtml +AddOutputFilter INCLUDES .shtml + + Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/mime.conf.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/negotiation.conf.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/negotiation.conf.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/negotiation.conf.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/negotiation.conf.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,18 @@ + +# +# LanguagePriority allows you to give precedence to some languages +# in case of a tie during content negotiation. +# +# Just list the languages in decreasing order of preference. We have +# more or less alphabetized them here. You probably want to change this. +# +LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv tr zh-CN zh-TW + +# +# ForceLanguagePriority allows you to serve a result page rather than +# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback) +# [in case no accepted languages matched the available variants] +# +ForceLanguagePriority Prefer Fallback + + Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/negotiation.conf.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/proxy.conf.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/proxy.conf.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/proxy.conf.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/proxy.conf.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,19 @@ + + #turning ProxyRequests on and allowing proxying from all may allow + #spammers to use your proxy to send email. + + ProxyRequests Off + + + AddDefaultCharset off + Order deny,allow + Deny from all + #Allow from .example.com + + + # Enable/disable the handling of HTTP/1.1 "Via:" headers. + # ("Full" adds the server version; "Block" removes all outgoing Via: headers) + # Set to one of: Off | On | Full | Block + + ProxyVia On + Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/proxy.conf.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/setenvif.conf.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/setenvif.conf.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/setenvif.conf.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/setenvif.conf.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,28 @@ + + +# +# The following directives modify normal HTTP response behavior to +# handle known problems with browser implementations. +# +BrowserMatch "Mozilla/2" nokeepalive +BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 +BrowserMatch "RealPlayer 4\.0" force-response-1.0 +BrowserMatch "Java/1\.0" force-response-1.0 +BrowserMatch "JDK/1\.0" force-response-1.0 + +# +# The following directive disables redirects on non-GET requests for +# a directory that does not include the trailing slash. This fixes a +# problem with Microsoft WebFolders which does not appropriately handle +# redirects for folders with DAV methods. +# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV. +# +BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully +BrowserMatch "MS FrontPage" redirect-carefully +BrowserMatch "^WebDrive" redirect-carefully +BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully +BrowserMatch "^gnome-vfs/1.0" redirect-carefully +BrowserMatch "^XML Spy" redirect-carefully +BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully + + Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/setenvif.conf.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/ssl.conf.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/ssl.conf.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/ssl.conf.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/ssl.conf.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,72 @@ + +# +# Pseudo Random Number Generator (PRNG): +# Configure one or more sources to seed the PRNG of the SSL library. +# The seed data should be of good random quality. +# WARNING! On some platforms /dev/random blocks if not enough entropy +# is available. This means you then cannot use the /dev/random device +# because it would lead to very long connection times (as long as +# it requires to make more entropy available). But usually those +# platforms additionally provide a /dev/urandom device which doesn't +# block. So, if available, use this one instead. Read the mod_ssl User +# Manual for more details. +# +SSLRandomSeed startup builtin +SSLRandomSeed startup file:/dev/urandom 512 +SSLRandomSeed connect builtin +SSLRandomSeed connect file:/dev/urandom 512 + +## +## SSL Global Context +## +## All SSL configuration in this context applies both to +## the main server and all SSL-enabled virtual hosts. +## + +# +# Some MIME-types for downloading Certificates and CRLs +# +AddType application/x-x509-ca-cert .crt +AddType application/x-pkcs7-crl .crl + +# Pass Phrase Dialog: +# Configure the pass phrase gathering process. +# The filtering dialog program (`builtin' is a internal +# terminal dialog) has to provide the pass phrase on stdout. +SSLPassPhraseDialog builtin + +# Inter-Process Session Cache: +# Configure the SSL Session Cache: First the mechanism +# to use and second the expiring timeout (in seconds). +#SSLSessionCache dbm:/var/run/apache2/ssl_scache +<% if node[:platform] == "centos" || node[:platform] == "redhat" || node[:platform] == "fedora" -%> +SSLSessionCache shmcb:/var/cache/mod_ssl/scache(512000) +<% else -%> +SSLSessionCache shmcb:/var/run/apache2/ssl_scache +<% end -%> +SSLSessionCacheTimeout 300 + +# Semaphore: +# Configure the path to the mutual exclusion semaphore the +# SSL engine uses internally for inter-process synchronization. +<% if node[:platform] == "centos" || node[:platform] == "redhat" || node[:platform] == "fedora" -%> +SSLMutex default +<% else -%> +SSLMutex file:/var/run/apache2/ssl_mutex +<% end -%> + +# SSL Cipher Suite: +# List the ciphers that the client is permitted to negotiate. +# See the mod_ssl documentation for a complete list. +# enable only secure ciphers: +SSLCipherSuite HIGH:MEDIUM:!ADH +# Use this instead if you want to allow cipher upgrades via SGC facility. +# In this case you also have to use something like +# SSLRequire %{SSL_CIPHER_USEKEYSIZE} >= 128 +# see http://httpd.apache.org/docs/2.2/ssl/ssl_howto.html.en#upgradeenc +#SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL + +# enable only secure protocols: SSLv3 and TLSv1, but not SSLv2 +SSLProtocol all -SSLv2 + + Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/ssl.conf.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/status.conf.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/status.conf.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/status.conf.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/status.conf.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,16 @@ + +# +# Allow server status reports generated by mod_status, +# with the URL of http://servername/server-status +# Uncomment and change the ".example.com" to allow +# access from other hosts. +# + + SetHandler server-status + Order deny,allow + Deny from all + Allow from localhost ip6-localhost +# Allow from .example.com + + + Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/mods/status.conf.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/port_apache.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/port_apache.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/port_apache.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/port_apache.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,2 @@ +# Port <%= @port %> +-A FWR -p tcp -m tcp --dport <%= @port %> -j ACCEPT \ No newline at end of file Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/port_apache.erb ------------------------------------------------------------------------------ svn:executable = * Added: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/ports.conf.erb URL: http://svn.apache.org/viewvc/incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/ports.conf.erb?rev=1537520&view=auto ============================================================================== --- incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/ports.conf.erb (added) +++ incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/ports.conf.erb Thu Oct 31 14:59:48 2013 @@ -0,0 +1,6 @@ +#This file generated via template by Chef. +<% @apache_listen_ports.each do |port| -%> +Listen <%= port %> +NameVirtualHost *:<%= port %> + +<% end -%> Propchange: incubator/climate/branches/rcmet-2.1.2/src/main/vm/src/cookbooks/apache2/templates/default/ports.conf.erb ------------------------------------------------------------------------------ svn:executable = *