diff --git a/README.md b/README.md index 32433ccc..1833d60d 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,3 @@ #OOCSS - -##Folders - -- [/oocss](oocss) -- [/vagrant](vagrant) - -###OOCSS folder -This folder contains all the handlebars, Sass and JavaScript files for the components and documentation. It also contains the scripts you need for starting and stopping the Vagrant box. - -###Vagrant folder -This folder contains all the vagrant files needed for building a new vagrant box and packaging it. \ No newline at end of file +Look into oocss folder for more informations +tree/master/oocss[tree/master/oocss] diff --git a/createproject.sh b/createproject.sh deleted file mode 100644 index 36dbedb7..00000000 --- a/createproject.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# This file help to create a new repository into our github account Stubbornella -# Usage : sh createproject.sh -# Example : sh createproject.sh "frba" "arnogues" - -#test if curl is installed -command -v curl >/dev/null 2>&1 || { echo >&2 "This script requires curl but it's not installed. Aborting."; exit 1; } - - -echo "create github repository" -curl -XPOST https://api.github.com/orgs/Stubbornella-Co/repos -u "${2}" -d "{\"name\":\"$1\",\"description\":\"project $1\", \"private\":true}" - - -echo "create project folder" -#mkdir ${TMPFOLDER} -# create tmp directory -rm -rf createrepotempfolder -TMPFOLDER=`mktemp -d /tmp/createrepotempfolder-XXXX` - - -echo ${TMPFOLDER} -echo "copy files from oocss folder" -rm oocss/.vagrant -rm -rf oocss/build -cp -R oocss/. ${TMPFOLDER} -cd ${TMPFOLDER} - -echo "push files of the project to github" -git init -git add . -git commit -m 'add oocss files' -git remote add origin git@github.com:Stubbornella-Co/$1.git -git push -u origin master - - -#delete folder tmp -rm -rf ${TMPFOLDER} -echo "Project created and filled with oocss content" diff --git a/vagrant/README.md b/vagrant/README.md deleted file mode 100644 index a3145aeb..00000000 --- a/vagrant/README.md +++ /dev/null @@ -1,7 +0,0 @@ -#Vagrant -This folder is used for creating the vagrant box that will be used for our projects for the clients -Vagrant is a tool that use virtual machines create with VirtualBox. - -##Updating the vagrantbox - - diff --git a/vagrant/Vagrantfile_create b/vagrant/Vagrantfile_create deleted file mode 100644 index f294f037..00000000 --- a/vagrant/Vagrantfile_create +++ /dev/null @@ -1,96 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant::Config.run do |config| - # All Vagrant configuration is done here. The most common configuration - # options are documented and commented below. For a complete reference, - # please see the online documentation at vagrantup.com. - - # Every Vagrant virtual environment requires a box to build off of. - config.vm.box = "vagrantpackage" - - # The url from where the 'config.vm.box' box will be fetched if it - # doesn't already exist on the user's system. - config.vm.box_url = "~/Dropbox/Public/vagrant/lucid32.box" - # config.vm.box_url = "http://files.vagrantup.com/lucid32.box" - - # Boot with a GUI so you can see the screen. (Default is headless) - # config.vm.boot_mode = :gui - - # Assign this VM to a host-only network IP, allowing you to access it - # via the IP. Host-only networks can talk to the host machine as well as - # any other machines on the same network, but cannot be accessed (through this - # network interface) by any external networks. - # config.vm.network :hostonly, "192.168.33.10" - - # Assign this VM to a bridged network, allowing you to connect directly to a - # network using the host's network device. This makes the VM appear as another - # physical device on your network. - # config.vm.network :bridged - - # Forward a port from the guest to the host, which allows for outside - # computers to access the VM, whereas host only networking does not. - config.vm.forward_port 80, 8080 - - # Share an additional folder to the guest VM. The first argument is - # an identifier, the second is the path on the guest to mount the - # folder, and the third is the path on the host to the actual folder. - # config.vm.share_folder "project", "/project", "./" - - # Enable provisioning with chef solo, specifying a cookbooks path, roles - # path, and data_bags path (all relative to this Vagrantfile), and adding - # some recipes and/or roles. - # - # config.vm.provision :chef_solo do |chef| - # chef.cookbooks_path = "../my-recipes/cookbooks" - # chef.roles_path = "../my-recipes/roles" - # chef.data_bags_path = "../my-recipes/data_bags" - # chef.add_recipe "mysql" - # chef.add_role "web" - # - # # You may also specify custom JSON attributes: - # chef.json = { :mysql_password => "foo" } - # end - - # Enable provisioning with chef server, specifying the chef server URL, - # and the path to the validation key (relative to this Vagrantfile). - # - # The Opscode Platform uses HTTPS. Substitute your organization for - # ORGNAME in the URL and validation key. - # - # If you have your own Chef Server, use the appropriate URL, which may be - # HTTP instead of HTTPS depending on your configuration. Also change the - # validation key to validation.pem. - # - # config.vm.provision :chef_client do |chef| - # chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME" - # chef.validation_key_path = "ORGNAME-validator.pem" - # end - # - # If you're using the Opscode platform, your validator client is - # ORGNAME-validator, replacing ORGNAME with your organization name. - # - # IF you have your own Chef Server, the default validation client name is - # chef-validator, unless you changed the configuration. - # - # chef.validation_client_name = "ORGNAME-validator" - - config.vm.provision :chef_solo do |chef| - #chef.cookbooks_path = "cookbooks.tar.gz" - chef.cookbooks_path = "cookbooks" - - chef.json = { - "custom" => { - "vhostdirectory" => "build" - }, - - "nodejs" => { - "version" => "0.8.18" - } - } - - chef.add_recipe("vagrant_main::install"); - #chef.add_recipe("vagrant_main"); - end - -end diff --git a/vagrant/Vagrantfile_package b/vagrant/Vagrantfile_package deleted file mode 100644 index 46f4ef49..00000000 --- a/vagrant/Vagrantfile_package +++ /dev/null @@ -1,9 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant::Config.run do |config| - config.vm.box = "vagrantpackage" - #config.vm.box_url = "~/Dropbox/Public/vagrant/package.box" - #config.vm.box_url = "https://dl.dropbox.com/u/558452/vagrant/package.box" - #config.vm.forward_port 80, 8080 -end \ No newline at end of file diff --git a/vagrant/cookbooks/apache2/README.rdoc b/vagrant/cookbooks/apache2/README.rdoc deleted file mode 100644 index db31d202..00000000 --- a/vagrant/cookbooks/apache2/README.rdoc +++ /dev/null @@ -1,78 +0,0 @@ -= DESCRIPTION: - -Complete Debian/Ubuntu style Apache2 configuration. - -= REQUIREMENTS: - -Debian or Ubuntu preferred. - -Red Hat/CentOS and Fedora can be used but will be converted to a Debian/Ubuntu style Apache as it's far easier to manage with chef. - -= ATTRIBUTES: - -The file attributes/apache.rb contains the following attribute types: - -* platform specific locations and settings. -* general settings -* prefork attributes -* worker attributes - -General settings and prefork/worker attributes are tunable. - -= USAGE: - -Include the apache2 recipe to install Apache2 and get 'sane' default settings. Configuration is modularized through Apache vhost sites a la Debian style configuration. - -For Red Hat, CentOS and Fedora you should first disable selinux as it's not supported (yet), then remove the stock httpd and all it's dependencies prior to attempting to use this recipe. Many packages in these distributions drop conflicting configs into conf.d, all of which haven't been accounted for yet. Starting from scratch will also make it far easier to debug. - -== Defines: - -* apache_module: sets up an Apache module. -* apache_conf: sets up a config file for an apache module. -* apache_site: sets up a vhost site. The conf file must be available. -* web_app: copies the template for a web app and enables it as a site via apache_site. - -== Web Apps: - -Various applications that can be set up with Apache as the front end, such as PHP, Django, Rails and others can use the web_app define to set up the template and the Apache site. The define is kind of dumb, so the template needs have the application implementation settings, since we don't know what your app is or what is needed from Apache. - -We only prototype one parameter for the web_app define, "template". This is used to specify the name of the template to use in the current cookbook. When you use web_app, you can set up any parameters you want to use in your template. They will get passed to the template through the params hash. For example, the sample web_app.conf.erb template in this cookbook makes use of these. - -* docroot -* server_name -* server_aliases - -These are available as @params[:docroot], @params[:server_name], @params[:server_aliases] within the template. - -If 'cookbook' and 'template' are not specified, the current cookbook's templates/default/web_app.conf.erb will be used. If this template is not suitable for your application, copy it to your cookbook and customize as needed. - -== God Monitor: - -There's a new recipe, apache2::god_monitor. You will need to make sure to include the 'god' recipe before using the apache2::god_monitor recipe in your cookbook. - -== OpenID Auth - -Installs the mod_auth_openid module from source. Specify an array of OpenIDs that are allowed to authenticate with the attribute apache[:allowed_openids]. Use the following in a vhost to protect with OpenID authentication: - - AuthOpenIDEnabled On - AuthOpenIDDBLocation /var/cache/apache2/mod_auth_openid.db - AuthOpenIDUserProgram /usr/local/bin/mod_auth_openid.rb - -Change the DBLocation as appropriate for your platform. You'll need to change the file in the recipe to match. The UserProgram is optional if you don't want to limit access by certain OpenIDs. - -= LICENSE & AUTHOR: - -Author:: Joshua Timberman () -Copyright:: 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. diff --git a/vagrant/cookbooks/apache2/attributes/default.rb b/vagrant/cookbooks/apache2/attributes/default.rb deleted file mode 100644 index 18212f9a..00000000 --- a/vagrant/cookbooks/apache2/attributes/default.rb +++ /dev/null @@ -1,77 +0,0 @@ -# -# Cookbook Name:: apache2 -# Attributes:: apache -# -# 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. -# - -# Where the various parts of apache are -case platform -when "redhat","centos","fedora","suse" - set[:apache][:dir] = "/etc/httpd" - set[:apache][:log_dir] = "/var/log/httpd" - set[:apache][:user] = "apache" - set[:apache][:binary] = "/usr/sbin/httpd" - set[:apache][:icondir] = "/var/www/icons/" -when "debian","ubuntu" - set[:apache][:dir] = "/etc/apache2" - set[:apache][:log_dir] = "/var/log/apache2" - set[:apache][:user] = "www-data" - set[:apache][:binary] = "/usr/sbin/apache2" - set[:apache][:icondir] = "/usr/share/apache2/icons" -else - set[:apache][:dir] = "/etc/apache2" - set[:apache][:log_dir] = "/var/log/apache2" - set[:apache][:user] = "www-data" - set[:apache][:binary] = "/usr/sbin/apache2" - set[:apache][:icondir] = "/usr/share/apache2/icons" -end - -### -# These settings need the unless, since we want them to be tunable, -# and we don't want to override the tunings. -### - -# General settings -default[:apache][:listen_ports] = [ "80","443" ] -default[:apache][:contact] = "ops@example.com" -default[:apache][:timeout] = 300 -default[:apache][:keepalive] = "On" -default[:apache][:keepaliverequests] = 100 -default[:apache][:keepalivetimeout] = 5 - -# Security -default[:apache][:servertokens] = "Prod" -default[:apache][:serversignature] = "On" -default[:apache][:traceenable] = "On" - -# mod_auth_openids -default[:apache][:allowed_openids] = Array.new - -# Prefork Attributes -default[:apache][:prefork][:startservers] = 16 -default[:apache][:prefork][:minspareservers] = 16 -default[:apache][:prefork][:maxspareservers] = 32 -default[:apache][:prefork][:serverlimit] = 400 -default[:apache][:prefork][:maxclients] = 400 -default[:apache][:prefork][:maxrequestsperchild] = 10000 - -# Worker Attributes -default[:apache][:worker][:startservers] = 4 -default[:apache][:worker][:maxclients] = 1024 -default[:apache][:worker][:minsparethreads] = 64 -default[:apache][:worker][:maxsparethreads] = 192 -default[:apache][:worker][:threadsperchild] = 64 -default[:apache][:worker][:maxrequestsperchild] = 0 diff --git a/vagrant/cookbooks/apache2/definitions/apache_conf.rb b/vagrant/cookbooks/apache2/definitions/apache_conf.rb deleted file mode 100644 index 24392897..00000000 --- a/vagrant/cookbooks/apache2/definitions/apache_conf.rb +++ /dev/null @@ -1,25 +0,0 @@ -# -# Cookbook Name:: apache2 -# Definition:: apache_conf -# -# 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. -# - -define :apache_conf do - template "#{node[:apache][:dir]}/mods-available/#{params[:name]}.conf" do - source "mods/#{params[:name]}.conf.erb" - notifies :restart, resources(:service => "apache2") - end -end diff --git a/vagrant/cookbooks/apache2/definitions/apache_module.rb b/vagrant/cookbooks/apache2/definitions/apache_module.rb deleted file mode 100644 index 2bd739e8..00000000 --- a/vagrant/cookbooks/apache2/definitions/apache_module.rb +++ /dev/null @@ -1,43 +0,0 @@ -# -# Cookbook Name:: apache2 -# Definition:: apache_module -# -# 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. -# - -define :apache_module, :enable => true, :conf => false do - include_recipe "apache2" - - if params[:conf] - apache_conf params[:name] - end - - if params[:enable] - execute "a2enmod #{params[:name]}" do - command "/usr/sbin/a2enmod #{params[:name]}" - notifies :restart, resources(:service => "apache2") - not_if do (File.symlink?("#{node[:apache][:dir]}/mods-enabled/#{params[:name]}.load") and - ((File.exists?("#{node[:apache][:dir]}/mods-available/#{params[:name]}.conf"))? - (File.symlink?("#{node[:apache][:dir]}/mods-enabled/#{params[:name]}.conf")):(true))) - end - end - else - execute "a2dismod #{params[:name]}" do - command "/usr/sbin/a2dismod #{params[:name]}" - notifies :restart, resources(:service => "apache2") - only_if do File.symlink?("#{node[:apache][:dir]}/mods-enabled/#{params[:name]}.load") end - end - end -end diff --git a/vagrant/cookbooks/apache2/definitions/apache_site.rb b/vagrant/cookbooks/apache2/definitions/apache_site.rb deleted file mode 100644 index 7316e013..00000000 --- a/vagrant/cookbooks/apache2/definitions/apache_site.rb +++ /dev/null @@ -1,40 +0,0 @@ -# -# Cookbook Name:: apache2 -# Definition:: apache_site -# -# 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. -# - -define :apache_site, :enable => true do - include_recipe "apache2" - - if params[:enable] - execute "a2ensite #{params[:name]}" do - command "/usr/sbin/a2ensite #{params[:name]}" - notifies :restart, resources(:service => "apache2") - not_if do - File.symlink?("#{node[:apache][:dir]}/sites-enabled/#{params[:name]}") or - File.symlink?("#{node[:apache][:dir]}/sites-enabled/000-#{params[:name]}") - end - only_if do File.exists?("#{node[:apache][:dir]}/sites-available/#{params[:name]}") end - end - else - execute "a2dissite #{params[:name]}" do - command "/usr/sbin/a2dissite #{params[:name]}" - notifies :restart, resources(:service => "apache2") - only_if do File.symlink?("#{node[:apache][:dir]}/sites-enabled/#{params[:name]}") end - end - end -end diff --git a/vagrant/cookbooks/apache2/definitions/web_app.rb b/vagrant/cookbooks/apache2/definitions/web_app.rb deleted file mode 100644 index b532708a..00000000 --- a/vagrant/cookbooks/apache2/definitions/web_app.rb +++ /dev/null @@ -1,49 +0,0 @@ -# -# Cookbook Name:: apache2 -# Definition:: web_app -# -# 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. -# - -define :web_app, :template => "web_app.conf.erb" do - - application_name = params[:name] - - include_recipe "apache2" - include_recipe "apache2::mod_rewrite" - include_recipe "apache2::mod_deflate" - include_recipe "apache2::mod_headers" - - template "#{node[:apache][:dir]}/sites-available/#{application_name}.conf" do - source params[:template] - owner "root" - group "root" - mode 0644 - if params[:cookbook] - cookbook params[:cookbook] - end - variables( - :application_name => application_name, - :params => params - ) - if File.exists?("#{node[:apache][:dir]}/sites-enabled/#{application_name}.conf") - notifies :reload, resources(:service => "apache2"), :delayed - end - end - - apache_site "#{params[:name]}.conf" do - enable enable_setting - end -end diff --git a/vagrant/cookbooks/apache2/files/default/apache2_module_conf_generate.pl b/vagrant/cookbooks/apache2/files/default/apache2_module_conf_generate.pl deleted file mode 100644 index 83f849ed..00000000 --- a/vagrant/cookbooks/apache2/files/default/apache2_module_conf_generate.pl +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/perl - -=begin - -Generates Ubuntu style module.load files. - -./apache2_module_conf_generate.pl /usr/lib64/httpd/modules /etc/httpd/mods-available - -ARGV[0] is the apache modules directory, ARGV[1] is where you want 'em. - -=cut - -use File::Find; - -use strict; -use warnings; - -die "Must have '/path/to/modules' and '/path/to/modules.load'" - unless $ARGV[0] && $ARGV[1]; - -find( - { - wanted => sub { - return 1 if $File::Find::name !~ /\.so$/; - my $modfile = $_; - $modfile =~ /(lib|mod_)(.+)\.so$/; - my $modname = $2; - my $filename = "$ARGV[1]/$modname.load"; - unless ( -f $filename ) { - open( FILE, ">", $filename ) or die "Cannot open $filename"; - print FILE "LoadModule " . $modname . "_module $File::Find::name\n"; - close(FILE); - } - }, - follow => 1, - }, - $ARGV[0] -); - -exit 0; - diff --git a/vagrant/cookbooks/apache2/metadata.json b/vagrant/cookbooks/apache2/metadata.json deleted file mode 100644 index a9280ea3..00000000 --- a/vagrant/cookbooks/apache2/metadata.json +++ /dev/null @@ -1,497 +0,0 @@ -{ - "suggestions": { - }, - "attributes": { - "apache/traceenable": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "On", - "type": "string", - "recipes": [ - - ], - "description": "Determine behavior of TRACE requests", - "display_name": "Apache Trace Enable" - }, - "apache/serversignature": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "On", - "type": "string", - "recipes": [ - - ], - "description": "Configure footer on server-generated documents", - "display_name": "Apache Server Signature" - }, - "apache/contact": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "ops@example.com", - "type": "string", - "recipes": [ - - ], - "description": "Email address of webmaster", - "display_name": "Apache Contact" - }, - "apache/icondir": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "/usr/share/apache2/icons", - "type": "string", - "recipes": [ - - ], - "description": "Directory location for icons", - "display_name": "Apache Icondir" - }, - "apache/user": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "www-data", - "type": "string", - "recipes": [ - - ], - "description": "User Apache runs as", - "display_name": "Apache User" - }, - "apache/worker/threadsperchild": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "64", - "type": "string", - "recipes": [ - - ], - "description": "Constant number of worker threads in each server process", - "display_name": "Apache Worker MPM ThreadsPerChild" - }, - "apache/worker/maxclients": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "1024", - "type": "string", - "recipes": [ - - ], - "description": "Maximum number of simultaneous connections", - "display_name": "Apache Worker MPM MaxClients" - }, - "apache/worker": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "type": "hash", - "recipes": [ - - ], - "description": "Hash of Apache prefork tuning attributes.", - "display_name": "Apache Worker" - }, - "apache/keepaliverequests": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "100", - "type": "string", - "recipes": [ - - ], - "description": "Number of requests allowed on a persistent connection", - "display_name": "Apache Keepalive Requests" - }, - "apache/timeout": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "300", - "type": "string", - "recipes": [ - - ], - "description": "Connection timeout value", - "display_name": "Apache Timeout" - }, - "apache/worker/maxrequestsperchild": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "0", - "type": "string", - "recipes": [ - - ], - "description": "Maximum number of request a child process will handle", - "display_name": "Apache Worker MPM MaxRequestsPerChild" - }, - "apache/dir": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "/etc/apache2", - "type": "string", - "recipes": [ - - ], - "description": "Location for Apache configuration", - "display_name": "Apache Directory" - }, - "apache/prefork/serverlimit": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "400", - "type": "string", - "recipes": [ - - ], - "description": "Upper limit on configurable server processes", - "display_name": "Apache Prefork MPM ServerLimit" - }, - "apache/prefork/minspareservers": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "16", - "type": "string", - "recipes": [ - - ], - "description": "Minimum number of spare server processes", - "display_name": "Apache Prefork MPM MinSpareServers" - }, - "apache/allowed_openids": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "", - "type": "string", - "recipes": [ - - ], - "description": "Array of OpenIDs allowed to authenticate", - "display_name": "Apache Allowed OpenIDs" - }, - "apache/binary": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "/usr/sbin/apache2", - "type": "string", - "recipes": [ - - ], - "description": "Apache server daemon program", - "display_name": "Apache Binary" - }, - "apache/prefork/startservers": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "16", - "type": "string", - "recipes": [ - - ], - "description": "Number of MPM servers to start", - "display_name": "Apache Prefork MPM StartServers" - }, - "apache/listen_ports": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": [ - "80", - "443" - ], - "type": "array", - "recipes": [ - - ], - "description": "Ports that Apache should listen on", - "display_name": "Apache Listen Ports" - }, - "apache/prefork/maxrequestsperchild": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "10000", - "type": "string", - "recipes": [ - - ], - "description": "Maximum number of request a child process will handle", - "display_name": "Apache Prefork MPM MaxRequestsPerChild" - }, - "apache/keepalivetimeout": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "5", - "type": "string", - "recipes": [ - - ], - "description": "Time to wait for requests on persistent connection", - "display_name": "Apache Keepalive Timeout" - }, - "apache/keepalive": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "On", - "type": "string", - "recipes": [ - - ], - "description": "HTTP persistent connections", - "display_name": "Apache Keepalive" - }, - "apache": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "type": "hash", - "recipes": [ - - ], - "description": "Hash of Apache attributes", - "display_name": "Apache Hash" - }, - "apache/worker/maxsparethreads": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "192", - "type": "string", - "recipes": [ - - ], - "description": "Maximum number of spare worker threads", - "display_name": "Apache Worker MPM MaxSpareThreads" - }, - "apache/worker/startservers": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "4", - "type": "string", - "recipes": [ - - ], - "description": "Initial number of server processes to start", - "display_name": "Apache Worker MPM StartServers" - }, - "apache/prefork/maxclients": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "400", - "type": "string", - "recipes": [ - - ], - "description": "Maximum number of simultaneous connections", - "display_name": "Apache Prefork MPM MaxClients" - }, - "apache/prefork": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "type": "hash", - "recipes": [ - - ], - "description": "Hash of Apache prefork tuning attributes.", - "display_name": "Apache Prefork" - }, - "apache/servertokens": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "Prod", - "type": "string", - "recipes": [ - - ], - "description": "Server response header", - "display_name": "Apache Server Tokens" - }, - "apache/log_dir": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "/etc/apache2", - "type": "string", - "recipes": [ - - ], - "description": "Location for Apache logs", - "display_name": "Apache Log Directory" - }, - "apache/worker/minsparethreads": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "64", - "type": "string", - "recipes": [ - - ], - "description": "Minimum number of spare worker threads", - "display_name": "Apache Worker MPM MinSpareThreads" - }, - "apache/prefork/maxspareservers": { - "required": "optional", - "calculated": false, - "choice": [ - - ], - "default": "32", - "type": "string", - "recipes": [ - - ], - "description": "Maximum number of spare server processes", - "display_name": "Apache Prefork MPM MaxSpareServers" - } - }, - "maintainer_email": "cookbooks@opscode.com", - "conflicting": { - }, - "dependencies": { - }, - "recipes": { - "apache2::mod_dav": "Apache module 'dav'", - "apache2::mod_proxy_ajp": "Apache module 'proxy_ajp'", - "apache2::mod_php5": "Apache module 'php5'", - "apache2::mod_mime": "Apache module 'mime' with config file", - "apache2::mod_deflate": "Apache module 'deflate' with config file", - "apache2::mod_ssl": "Apache module 'ssl' with config file, adds port 443 to listen_ports", - "apache2::mod_setenvif": "Apache module 'setenvif' with config file", - "apache2::mod_python": "Apache module 'python'", - "apache2::mod_negotiation": "Apache module 'negotiation' with config file", - "apache2::mod_cgi": "Apache module 'cgi'", - "apache2::mod_authz_groupfile": "Apache module 'authz_groupfile'", - "apache2::mod_auth_basic": "Apache module 'auth_basic'", - "apache2::mod_rewrite": "Apache module 'rewrite'", - "apache2::mod_dav_svn": "Apache module 'dav_svn'", - "apache2::mod_autoindex": "Apache module 'autoindex' with config file", - "apache2::mod_authz_host": "Apache module 'authz_host'", - "apache2::mod_headers": "Apache module 'headers'", - "apache2::mod_authz_user": "Apache module 'authz_user'", - "apache2::mod_proxy_connect": "Apache module 'proxy_connect'", - "apache2::mod_proxy": "Apache module 'proxy' with config file", - "apache2::mod_fcgid": "Apache module 'fcgid', package on ubuntu/debian, rhel/centos, compile source on suse; with config file", - "apache2::mod_authnz_ldap": "Apache module 'authnz_ldap'", - "apache2::mod_auth_digest": "Apache module 'auth_digest'", - "apache2::mod_env": "Apache module 'env'", - "apache2::mod_status": "Apache module 'status' with config file", - "apache2::mod_proxy_http": "Apache module 'proxy_http'", - "apache2::mod_log_config": "Apache module 'log_config'", - "apache2::mod_ldap": "Apache module 'ldap'", - "apache2::mod_expires": "Apache module 'expires'", - "apache2::mod_alias": "Apache module 'alias' with config file", - "apache2": "Main Apache configuration", - "apache2::mod_authn_file": "Apache module 'authn_file'", - "apache2::mod_auth_openid": "Apache module 'authopenid'", - "apache2::mod_proxy_balancer": "Apache module 'proxy_balancer'", - "apache2::mod_dir": "Apache module 'dir' with config file", - "apache2::mod_authz_default": "Apache module 'authz_default'" - }, - "providing": { - }, - "platforms": { - "debian": [ - - ], - "centos": [ - - ], - "ubuntu": [ - - ], - "redhat": [ - - ] - }, - "license": "Apache 2.0", - "version": "0.12.2", - "replacing": { - }, - "groupings": { - }, - "name": "apache2", - "recommendations": { - }, - "description": "Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions", - "maintainer": "Opscode, Inc.", - "long_description": "= DESCRIPTION:\n\nComplete Debian/Ubuntu style Apache2 configuration.\n\n= REQUIREMENTS:\n\nDebian or Ubuntu preferred.\n\nRed Hat/CentOS and Fedora can be used but will be converted to a Debian/Ubuntu style Apache as it's far easier to manage with chef. \n\n= ATTRIBUTES:\n\nThe file attributes/apache.rb contains the following attribute types:\n\n* platform specific locations and settings.\n* general settings\n* prefork attributes\n* worker attributes\n\nGeneral settings and prefork/worker attributes are tunable.\n\n= USAGE:\n\nInclude the apache2 recipe to install Apache2 and get 'sane' default settings. Configuration is modularized through Apache vhost sites a la Debian style configuration.\n\nFor Red Hat, CentOS and Fedora you should first disable selinux as it's not supported (yet), then remove the stock httpd and all it's dependencies prior to attempting to use this recipe. Many packages in these distributions drop conflicting configs into conf.d, all of which haven't been accounted for yet. Starting from scratch will also make it far easier to debug.\n\n== Defines:\n\n* apache_module: sets up an Apache module.\n* apache_conf: sets up a config file for an apache module.\n* apache_site: sets up a vhost site. The conf file must be available.\n* web_app: copies the template for a web app and enables it as a site via apache_site.\n\n== Web Apps:\n\nVarious applications that can be set up with Apache as the front end, such as PHP, Django, Rails and others can use the web_app define to set up the template and the Apache site. The define is kind of dumb, so the template needs have the application implementation settings, since we don't know what your app is or what is needed from Apache.\n\nWe only prototype one parameter for the web_app define, \"template\". This is used to specify the name of the template to use in the current cookbook. When you use web_app, you can set up any parameters you want to use in your template. They will get passed to the template through the params hash. For example, the sample web_app.conf.erb template in this cookbook makes use of these.\n\n* docroot\n* server_name\n* server_aliases\n\nThese are available as @params[:docroot], @params[:server_name], @params[:server_aliases] within the template. \n\nIf 'cookbook' and 'template' are not specified, the current cookbook's templates/default/web_app.conf.erb will be used. If this template is not suitable for your application, copy it to your cookbook and customize as needed.\n\n== God Monitor:\n\nThere's a new recipe, apache2::god_monitor. You will need to make sure to include the 'god' recipe before using the apache2::god_monitor recipe in your cookbook.\n\n== OpenID Auth\n\nInstalls the mod_auth_openid module from source. Specify an array of OpenIDs that are allowed to authenticate with the attribute apache[:allowed_openids]. Use the following in a vhost to protect with OpenID authentication:\n\n AuthOpenIDEnabled On\n AuthOpenIDDBLocation /var/cache/apache2/mod_auth_openid.db\n AuthOpenIDUserProgram /usr/local/bin/mod_auth_openid.rb\n\nChange the DBLocation as appropriate for your platform. You'll need to change the file in the recipe to match. The UserProgram is optional if you don't want to limit access by certain OpenIDs.\n\n= LICENSE & AUTHOR:\n\nAuthor:: Joshua Timberman ()\nCopyright:: 2009, Opscode, Inc\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" - } \ No newline at end of file diff --git a/vagrant/cookbooks/apache2/metadata.rb b/vagrant/cookbooks/apache2/metadata.rb deleted file mode 100644 index 51f2977a..00000000 --- a/vagrant/cookbooks/apache2/metadata.rb +++ /dev/null @@ -1,197 +0,0 @@ -maintainer "Opscode, Inc." -maintainer_email "cookbooks@opscode.com" -license "Apache 2.0" -description "Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions" -long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc')) -version "0.12.2" -recipe "apache2", "Main Apache configuration" -recipe "apache2::mod_alias", "Apache module 'alias' with config file" -recipe "apache2::mod_auth_basic", "Apache module 'auth_basic'" -recipe "apache2::mod_auth_digest", "Apache module 'auth_digest'" -recipe "apache2::mod_auth_openid", "Apache module 'authopenid'" -recipe "apache2::mod_authn_file", "Apache module 'authn_file'" -recipe "apache2::mod_authnz_ldap", "Apache module 'authnz_ldap'" -recipe "apache2::mod_authz_default", "Apache module 'authz_default'" -recipe "apache2::mod_authz_groupfile", "Apache module 'authz_groupfile'" -recipe "apache2::mod_authz_host", "Apache module 'authz_host'" -recipe "apache2::mod_authz_user", "Apache module 'authz_user'" -recipe "apache2::mod_autoindex", "Apache module 'autoindex' with config file" -recipe "apache2::mod_cgi", "Apache module 'cgi'" -recipe "apache2::mod_dav", "Apache module 'dav'" -recipe "apache2::mod_dav_svn", "Apache module 'dav_svn'" -recipe "apache2::mod_deflate", "Apache module 'deflate' with config file" -recipe "apache2::mod_dir", "Apache module 'dir' with config file" -recipe "apache2::mod_env", "Apache module 'env'" -recipe "apache2::mod_expires", "Apache module 'expires'" -recipe "apache2::mod_fcgid", "Apache module 'fcgid', package on ubuntu/debian, rhel/centos, compile source on suse; with config file" -recipe "apache2::mod_headers", "Apache module 'headers'" -recipe "apache2::mod_ldap", "Apache module 'ldap'" -recipe "apache2::mod_log_config", "Apache module 'log_config'" -recipe "apache2::mod_mime", "Apache module 'mime' with config file" -recipe "apache2::mod_negotiation", "Apache module 'negotiation' with config file" -recipe "apache2::mod_php5", "Apache module 'php5'" -recipe "apache2::mod_proxy", "Apache module 'proxy' with config file" -recipe "apache2::mod_proxy_ajp", "Apache module 'proxy_ajp'" -recipe "apache2::mod_proxy_balancer", "Apache module 'proxy_balancer'" -recipe "apache2::mod_proxy_connect", "Apache module 'proxy_connect'" -recipe "apache2::mod_proxy_http", "Apache module 'proxy_http'" -recipe "apache2::mod_python", "Apache module 'python'" -recipe "apache2::mod_rewrite", "Apache module 'rewrite'" -recipe "apache2::mod_setenvif", "Apache module 'setenvif' with config file" -recipe "apache2::mod_ssl", "Apache module 'ssl' with config file, adds port 443 to listen_ports" -recipe "apache2::mod_status", "Apache module 'status' with config file" - -%w{redhat centos debian ubuntu}.each do |os| - supports os -end - -attribute "apache", - :display_name => "Apache Hash", - :description => "Hash of Apache attributes", - :type => "hash" - -attribute "apache/dir", - :display_name => "Apache Directory", - :description => "Location for Apache configuration", - :default => "/etc/apache2" - -attribute "apache/log_dir", - :display_name => "Apache Log Directory", - :description => "Location for Apache logs", - :default => "/etc/apache2" - -attribute "apache/user", - :display_name => "Apache User", - :description => "User Apache runs as", - :default => "www-data" - -attribute "apache/binary", - :display_name => "Apache Binary", - :description => "Apache server daemon program", - :default => "/usr/sbin/apache2" - -attribute "apache/icondir", - :display_name => "Apache Icondir", - :description => "Directory location for icons", - :default => "/usr/share/apache2/icons" - -attribute "apache/listen_ports", - :display_name => "Apache Listen Ports", - :description => "Ports that Apache should listen on", - :type => "array", - :default => [ "80", "443" ] - -attribute "apache/contact", - :display_name => "Apache Contact", - :description => "Email address of webmaster", - :default => "ops@example.com" - -attribute "apache/timeout", - :display_name => "Apache Timeout", - :description => "Connection timeout value", - :default => "300" - -attribute "apache/keepalive", - :display_name => "Apache Keepalive", - :description => "HTTP persistent connections", - :default => "On" - -attribute "apache/keepaliverequests", - :display_name => "Apache Keepalive Requests", - :description => "Number of requests allowed on a persistent connection", - :default => "100" - -attribute "apache/keepalivetimeout", - :display_name => "Apache Keepalive Timeout", - :description => "Time to wait for requests on persistent connection", - :default => "5" - -attribute "apache/servertokens", - :display_name => "Apache Server Tokens", - :description => "Server response header", - :default => "Prod" - -attribute "apache/serversignature", - :display_name => "Apache Server Signature", - :description => "Configure footer on server-generated documents", - :default => "On" - -attribute "apache/traceenable", - :display_name => "Apache Trace Enable", - :description => "Determine behavior of TRACE requests", - :default => "On" - -attribute "apache/allowed_openids", - :display_name => "Apache Allowed OpenIDs", - :description => "Array of OpenIDs allowed to authenticate", - :default => "" - -attribute "apache/prefork", - :display_name => "Apache Prefork", - :description => "Hash of Apache prefork tuning attributes.", - :type => "hash" - -attribute "apache/prefork/startservers", - :display_name => "Apache Prefork MPM StartServers", - :description => "Number of MPM servers to start", - :default => "16" - -attribute "apache/prefork/minspareservers", - :display_name => "Apache Prefork MPM MinSpareServers", - :description => "Minimum number of spare server processes", - :default => "16" - -attribute "apache/prefork/maxspareservers", - :display_name => "Apache Prefork MPM MaxSpareServers", - :description => "Maximum number of spare server processes", - :default => "32" - -attribute "apache/prefork/serverlimit", - :display_name => "Apache Prefork MPM ServerLimit", - :description => "Upper limit on configurable server processes", - :default => "400" - -attribute "apache/prefork/maxclients", - :display_name => "Apache Prefork MPM MaxClients", - :description => "Maximum number of simultaneous connections", - :default => "400" - -attribute "apache/prefork/maxrequestsperchild", - :display_name => "Apache Prefork MPM MaxRequestsPerChild", - :description => "Maximum number of request a child process will handle", - :default => "10000" - -attribute "apache/worker", - :display_name => "Apache Worker", - :description => "Hash of Apache prefork tuning attributes.", - :type => "hash" - -attribute "apache/worker/startservers", - :display_name => "Apache Worker MPM StartServers", - :description => "Initial number of server processes to start", - :default => "4" - -attribute "apache/worker/maxclients", - :display_name => "Apache Worker MPM MaxClients", - :description => "Maximum number of simultaneous connections", - :default => "1024" - -attribute "apache/worker/minsparethreads", - :display_name => "Apache Worker MPM MinSpareThreads", - :description => "Minimum number of spare worker threads", - :default => "64" - -attribute "apache/worker/maxsparethreads", - :display_name => "Apache Worker MPM MaxSpareThreads", - :description => "Maximum number of spare worker threads", - :default => "192" - -attribute "apache/worker/threadsperchild", - :display_name => "Apache Worker MPM ThreadsPerChild", - :description => "Constant number of worker threads in each server process", - :default => "64" - -attribute "apache/worker/maxrequestsperchild", - :display_name => "Apache Worker MPM MaxRequestsPerChild", - :description => "Maximum number of request a child process will handle", - :default => "0" diff --git a/vagrant/cookbooks/apache2/recipes/default.rb b/vagrant/cookbooks/apache2/recipes/default.rb deleted file mode 100644 index 7aef323d..00000000 --- a/vagrant/cookbooks/apache2/recipes/default.rb +++ /dev/null @@ -1,191 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: default -# -# 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 "apache2" do - case node[:platform] - when "centos","redhat","fedora","suse" - package_name "httpd" - when "debian","ubuntu" - package_name "apache2" - end - action :install -end - -service "apache2" do - case node[:platform] - when "centos","redhat","fedora","suse" - service_name "httpd" - # If restarted/reloaded too quickly httpd has a habit of failing. - # This may happen with multiple recipes notifying apache to restart - like - # during the initial bootstrap. - restart_command "/sbin/service httpd restart && sleep 1" - reload_command "/sbin/service httpd reload && sleep 1" - when "debian","ubuntu" - service_name "apache2" - end - supports value_for_platform( - "debian" => { "4.0" => [ :restart, :reload ], "default" => [ :restart, :reload, :status ] }, - "ubuntu" => { "default" => [ :restart, :reload, :status ] }, - "centos" => { "default" => [ :restart, :reload, :status ] }, - "redhat" => { "default" => [ :restart, :reload, :status ] }, - "fedora" => { "default" => [ :restart, :reload, :status ] }, - "default" => { "default" => [:restart, :reload ] } - ) - action :enable -end - -if platform?("centos", "redhat", "fedora", "suse") - directory node[:apache][:log_dir] do - mode 0755 - action :create - end - - cookbook_file "/usr/local/bin/apache2_module_conf_generate.pl" do - source "apache2_module_conf_generate.pl" - mode 0755 - owner "root" - group "root" - end - - %w{sites-available sites-enabled mods-available mods-enabled}.each do |dir| - directory "#{node[:apache][:dir]}/#{dir}" do - mode 0755 - owner "root" - group "root" - action :create - end - end - - execute "generate-module-list" do - if node[:kernel][:machine] == "x86_64" - libdir = "lib64" - else - libdir = "lib" - end - command "/usr/local/bin/apache2_module_conf_generate.pl /usr/#{libdir}/httpd/modules /etc/httpd/mods-available" - - action :run - end - - %w{a2ensite a2dissite a2enmod a2dismod}.each do |modscript| - template "/usr/sbin/#{modscript}" do - source "#{modscript}.erb" - mode 0755 - owner "root" - group "root" - end - end - - # installed by default on centos/rhel, remove in favour of mods-enabled - file "#{node[:apache][:dir]}/conf.d/proxy_ajp.conf" do - action :delete - backup false - end - file "#{node[:apache][:dir]}/conf.d/README" do - action :delete - backup false - end - - # welcome page moved to the default-site.rb temlate - file "#{node[:apache][:dir]}/conf.d/welcome.conf" do - action :delete - backup false - end -end - -directory "#{node[:apache][:dir]}/ssl" do - action :create - mode 0755 - owner "root" - group "root" -end - -template "apache2.conf" do - case node[:platform] - when "centos","redhat","fedora" - path "#{node[:apache][:dir]}/conf/httpd.conf" - when "debian","ubuntu" - path "#{node[:apache][:dir]}/apache2.conf" - end - source "apache2.conf.erb" - owner "root" - group "root" - mode 0644 - notifies :restart, resources(:service => "apache2") -end - -template "security" do - path "#{node[:apache][:dir]}/conf.d/security" - source "security.erb" - owner "root" - group "root" - mode 0644 - backup false - notifies :restart, resources(:service => "apache2") -end - -template "charset" do - path "#{node[:apache][:dir]}/conf.d/charset" - source "charset.erb" - owner "root" - group "root" - mode 0644 - backup false - notifies :restart, resources(:service => "apache2") -end - -template "#{node[:apache][:dir]}/ports.conf" do - source "ports.conf.erb" - group "root" - owner "root" - variables :apache_listen_ports => node[:apache][:listen_ports] - mode 0644 - notifies :restart, resources(:service => "apache2") -end - -template "#{node[:apache][:dir]}/sites-available/default" do - source "default-site.erb" - owner "root" - group "root" - mode 0644 - notifies :restart, resources(:service => "apache2") -end - -include_recipe "apache2::mod_status" -include_recipe "apache2::mod_alias" -include_recipe "apache2::mod_auth_basic" -include_recipe "apache2::mod_authn_file" -include_recipe "apache2::mod_authz_default" -include_recipe "apache2::mod_authz_groupfile" -include_recipe "apache2::mod_authz_host" -include_recipe "apache2::mod_authz_user" -include_recipe "apache2::mod_autoindex" -include_recipe "apache2::mod_dir" -include_recipe "apache2::mod_env" -include_recipe "apache2::mod_mime" -include_recipe "apache2::mod_negotiation" -include_recipe "apache2::mod_setenvif" -include_recipe "apache2::mod_log_config" if platform?("centos", "redhat", "suse") - -# uncomment to get working example site on centos/redhat/fedora -#apache_site "default" - -service "apache2" do - action :start -end diff --git a/vagrant/cookbooks/apache2/recipes/god_monitor.rb b/vagrant/cookbooks/apache2/recipes/god_monitor.rb deleted file mode 100644 index b3c49ebf..00000000 --- a/vagrant/cookbooks/apache2/recipes/god_monitor.rb +++ /dev/null @@ -1,33 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: god_monitor -# -# 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_service = service "apache2" do - action :nothing -end - -start_command = apache_service.start_command -stop_command = apache_service.stop_command -restart_command = apache_service.restart_command - -god_monitor "apache2" do - config "apache2.god.erb" - start (start_command)?start_command : "/etc/init.d/#{apache_service.service_name} start" - restart (restart_command)?restart_command : "/etc/init.d/#{apache_service.service_name} restart" - stop (stop_command)?stop_command : "/etc/init.d/#{apache_service.service_name} stop" -end diff --git a/vagrant/cookbooks/apache2/recipes/mod_alias.rb b/vagrant/cookbooks/apache2/recipes/mod_alias.rb deleted file mode 100644 index a4618ed8..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_alias.rb +++ /dev/null @@ -1,22 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: alias -# -# 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 "alias" do - conf true -end diff --git a/vagrant/cookbooks/apache2/recipes/mod_auth_basic.rb b/vagrant/cookbooks/apache2/recipes/mod_auth_basic.rb deleted file mode 100644 index d30264f9..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_auth_basic.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: auth_basic -# -# 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 "auth_basic" diff --git a/vagrant/cookbooks/apache2/recipes/mod_auth_digest.rb b/vagrant/cookbooks/apache2/recipes/mod_auth_digest.rb deleted file mode 100644 index 5aef9260..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_auth_digest.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: auth_digest -# -# 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 "auth_digest" diff --git a/vagrant/cookbooks/apache2/recipes/mod_auth_openid.rb b/vagrant/cookbooks/apache2/recipes/mod_auth_openid.rb deleted file mode 100644 index 83cc2205..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_auth_openid.rb +++ /dev/null @@ -1,59 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: mod_auth_openid -# -# 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. -# - -%w{ apache2-prefork-dev libopkele-dev libopkele3 }.each do |pkg| - package pkg -end - -remote_file "/tmp/mod_auth_openid-0.4.tar.gz" do - source "http://butterfat.net/releases/mod_auth_openid/mod_auth_openid-0.4.tar.gz" - mode 0644 -end - -bash "install mod_auth_openid" do - cwd "/tmp" - code <<-EOH - tar zxvf mod_auth_openid-0.4.tar.gz - cd mod_auth_openid-0.4 && ./configure - perl -pi -e "s/-i -a -n 'authopenid'/-i -n 'authopenid'/g" Makefile - make && make install - EOH - not_if { File.exists?("/usr/lib/apache2/modules/mod_auth_openid.so") } -end - -file "/var/cache/apache2/mod_auth_openid.db" do - owner node[:apache][:user] - mode 0600 -end - -template "#{node[:apache][:dir]}/mods-available/authopenid.load" do - source "mods/authopenid.load.erb" - owner "root" - group "root" - mode 0644 -end - -apache_module "authopenid" - -template "/usr/local/bin/mod_auth_openid.rb" do - source "mod_auth_openid.rb.erb" - owner node[:apache][:user] - group node[:apache][:user] - mode 0750 -end diff --git a/vagrant/cookbooks/apache2/recipes/mod_authn_file.rb b/vagrant/cookbooks/apache2/recipes/mod_authn_file.rb deleted file mode 100644 index 872caa73..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_authn_file.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: authn_file -# -# 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 "authn_file" diff --git a/vagrant/cookbooks/apache2/recipes/mod_authnz_ldap.rb b/vagrant/cookbooks/apache2/recipes/mod_authnz_ldap.rb deleted file mode 100644 index 0310d243..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_authnz_ldap.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: authnz_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 "authnz_ldap" diff --git a/vagrant/cookbooks/apache2/recipes/mod_authz_default.rb b/vagrant/cookbooks/apache2/recipes/mod_authz_default.rb deleted file mode 100644 index 123536d0..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_authz_default.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: authz_default -# -# 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 "authz_default" diff --git a/vagrant/cookbooks/apache2/recipes/mod_authz_groupfile.rb b/vagrant/cookbooks/apache2/recipes/mod_authz_groupfile.rb deleted file mode 100644 index b2833b21..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_authz_groupfile.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: authz_groupfile -# -# 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 "authz_groupfile" diff --git a/vagrant/cookbooks/apache2/recipes/mod_authz_host.rb b/vagrant/cookbooks/apache2/recipes/mod_authz_host.rb deleted file mode 100644 index 87c1a4b0..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_authz_host.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: authz_host -# -# 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 "authz_host" diff --git a/vagrant/cookbooks/apache2/recipes/mod_authz_user.rb b/vagrant/cookbooks/apache2/recipes/mod_authz_user.rb deleted file mode 100644 index 8dd46dfa..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_authz_user.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: authz_user -# -# 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 "authz_user" diff --git a/vagrant/cookbooks/apache2/recipes/mod_autoindex.rb b/vagrant/cookbooks/apache2/recipes/mod_autoindex.rb deleted file mode 100644 index 622a66e9..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_autoindex.rb +++ /dev/null @@ -1,22 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: autoindex -# -# 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 "autoindex" do - conf true -end diff --git a/vagrant/cookbooks/apache2/recipes/mod_cgi.rb b/vagrant/cookbooks/apache2/recipes/mod_cgi.rb deleted file mode 100644 index 6c15a053..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_cgi.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: cgi -# -# 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 "cgi" diff --git a/vagrant/cookbooks/apache2/recipes/mod_dav.rb b/vagrant/cookbooks/apache2/recipes/mod_dav.rb deleted file mode 100644 index fef656ad..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_dav.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: dav -# -# 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 "dav" diff --git a/vagrant/cookbooks/apache2/recipes/mod_dav_svn.rb b/vagrant/cookbooks/apache2/recipes/mod_dav_svn.rb deleted file mode 100644 index ce50d549..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_dav_svn.rb +++ /dev/null @@ -1,22 +0,0 @@ -# -# Cookbook Name:: apache2 -# Recipe:: dav_svn -# -# 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-svn" - -apache_module "dav_svn" diff --git a/vagrant/cookbooks/apache2/recipes/mod_deflate.rb b/vagrant/cookbooks/apache2/recipes/mod_deflate.rb deleted file mode 100644 index b568f305..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_deflate.rb +++ /dev/null @@ -1,22 +0,0 @@ -# -# 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 diff --git a/vagrant/cookbooks/apache2/recipes/mod_dir.rb b/vagrant/cookbooks/apache2/recipes/mod_dir.rb deleted file mode 100644 index 9930c3ac..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_dir.rb +++ /dev/null @@ -1,22 +0,0 @@ -# -# 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 diff --git a/vagrant/cookbooks/apache2/recipes/mod_env.rb b/vagrant/cookbooks/apache2/recipes/mod_env.rb deleted file mode 100644 index d3455031..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_env.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# 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" diff --git a/vagrant/cookbooks/apache2/recipes/mod_expires.rb b/vagrant/cookbooks/apache2/recipes/mod_expires.rb deleted file mode 100644 index 9e5042e3..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_expires.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# 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" diff --git a/vagrant/cookbooks/apache2/recipes/mod_fcgid.rb b/vagrant/cookbooks/apache2/recipes/mod_fcgid.rb deleted file mode 100644 index ea7ec3e8..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_fcgid.rb +++ /dev/null @@ -1,46 +0,0 @@ -# -# 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 diff --git a/vagrant/cookbooks/apache2/recipes/mod_headers.rb b/vagrant/cookbooks/apache2/recipes/mod_headers.rb deleted file mode 100644 index 5e6b94d1..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_headers.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# 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" diff --git a/vagrant/cookbooks/apache2/recipes/mod_ldap.rb b/vagrant/cookbooks/apache2/recipes/mod_ldap.rb deleted file mode 100644 index 0877694a..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_ldap.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# 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" diff --git a/vagrant/cookbooks/apache2/recipes/mod_log_config.rb b/vagrant/cookbooks/apache2/recipes/mod_log_config.rb deleted file mode 100644 index fa8a484e..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_log_config.rb +++ /dev/null @@ -1,24 +0,0 @@ -# -# 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 diff --git a/vagrant/cookbooks/apache2/recipes/mod_mime.rb b/vagrant/cookbooks/apache2/recipes/mod_mime.rb deleted file mode 100644 index 16aee1ad..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_mime.rb +++ /dev/null @@ -1,22 +0,0 @@ -# -# 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 diff --git a/vagrant/cookbooks/apache2/recipes/mod_negotiation.rb b/vagrant/cookbooks/apache2/recipes/mod_negotiation.rb deleted file mode 100644 index 348e11f1..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_negotiation.rb +++ /dev/null @@ -1,22 +0,0 @@ -# -# 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 diff --git a/vagrant/cookbooks/apache2/recipes/mod_php5.rb b/vagrant/cookbooks/apache2/recipes/mod_php5.rb deleted file mode 100644 index b6ae2c07..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_php5.rb +++ /dev/null @@ -1,32 +0,0 @@ -# -# 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" diff --git a/vagrant/cookbooks/apache2/recipes/mod_proxy.rb b/vagrant/cookbooks/apache2/recipes/mod_proxy.rb deleted file mode 100644 index fff7627b..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_proxy.rb +++ /dev/null @@ -1,22 +0,0 @@ -# -# 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 diff --git a/vagrant/cookbooks/apache2/recipes/mod_proxy_ajp.rb b/vagrant/cookbooks/apache2/recipes/mod_proxy_ajp.rb deleted file mode 100644 index 617a2c22..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_proxy_ajp.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# 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" diff --git a/vagrant/cookbooks/apache2/recipes/mod_proxy_balancer.rb b/vagrant/cookbooks/apache2/recipes/mod_proxy_balancer.rb deleted file mode 100644 index dc62a710..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_proxy_balancer.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# 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" diff --git a/vagrant/cookbooks/apache2/recipes/mod_proxy_connect.rb b/vagrant/cookbooks/apache2/recipes/mod_proxy_connect.rb deleted file mode 100644 index f41954f1..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_proxy_connect.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# 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" diff --git a/vagrant/cookbooks/apache2/recipes/mod_proxy_http.rb b/vagrant/cookbooks/apache2/recipes/mod_proxy_http.rb deleted file mode 100644 index ddff3eaf..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_proxy_http.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# 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" diff --git a/vagrant/cookbooks/apache2/recipes/mod_python.rb b/vagrant/cookbooks/apache2/recipes/mod_python.rb deleted file mode 100644 index feaca03a..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_python.rb +++ /dev/null @@ -1,22 +0,0 @@ -# -# 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" diff --git a/vagrant/cookbooks/apache2/recipes/mod_rewrite.rb b/vagrant/cookbooks/apache2/recipes/mod_rewrite.rb deleted file mode 100644 index df388a67..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_rewrite.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# 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" diff --git a/vagrant/cookbooks/apache2/recipes/mod_setenvif.rb b/vagrant/cookbooks/apache2/recipes/mod_setenvif.rb deleted file mode 100644 index 4048a5f9..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_setenvif.rb +++ /dev/null @@ -1,22 +0,0 @@ -# -# 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 diff --git a/vagrant/cookbooks/apache2/recipes/mod_ssl.rb b/vagrant/cookbooks/apache2/recipes/mod_ssl.rb deleted file mode 100644 index e82b9d17..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_ssl.rb +++ /dev/null @@ -1,42 +0,0 @@ -# -# 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 diff --git a/vagrant/cookbooks/apache2/recipes/mod_status.rb b/vagrant/cookbooks/apache2/recipes/mod_status.rb deleted file mode 100644 index 3e717274..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_status.rb +++ /dev/null @@ -1,22 +0,0 @@ -# -# 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 diff --git a/vagrant/cookbooks/apache2/recipes/mod_wsgi.rb b/vagrant/cookbooks/apache2/recipes/mod_wsgi.rb deleted file mode 100644 index f54919f7..00000000 --- a/vagrant/cookbooks/apache2/recipes/mod_wsgi.rb +++ /dev/null @@ -1,27 +0,0 @@ -# -# 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" diff --git a/vagrant/cookbooks/apache2/templates/default/a2dismod.erb b/vagrant/cookbooks/apache2/templates/default/a2dismod.erb deleted file mode 100644 index 06fb6b36..00000000 --- a/vagrant/cookbooks/apache2/templates/default/a2dismod.erb +++ /dev/null @@ -1,22 +0,0 @@ -#!/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 diff --git a/vagrant/cookbooks/apache2/templates/default/a2dissite.erb b/vagrant/cookbooks/apache2/templates/default/a2dissite.erb deleted file mode 100644 index 41feda57..00000000 --- a/vagrant/cookbooks/apache2/templates/default/a2dissite.erb +++ /dev/null @@ -1,29 +0,0 @@ -#!/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 diff --git a/vagrant/cookbooks/apache2/templates/default/a2enmod.erb b/vagrant/cookbooks/apache2/templates/default/a2enmod.erb deleted file mode 100644 index a59c72fe..00000000 --- a/vagrant/cookbooks/apache2/templates/default/a2enmod.erb +++ /dev/null @@ -1,37 +0,0 @@ -#!/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 diff --git a/vagrant/cookbooks/apache2/templates/default/a2ensite.erb b/vagrant/cookbooks/apache2/templates/default/a2ensite.erb deleted file mode 100644 index 4288869f..00000000 --- a/vagrant/cookbooks/apache2/templates/default/a2ensite.erb +++ /dev/null @@ -1,38 +0,0 @@ -#!/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 diff --git a/vagrant/cookbooks/apache2/templates/default/apache2.conf.erb b/vagrant/cookbooks/apache2/templates/default/apache2.conf.erb deleted file mode 100644 index c94b92a1..00000000 --- a/vagrant/cookbooks/apache2/templates/default/apache2.conf.erb +++ /dev/null @@ -1,230 +0,0 @@ -# -# 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/ diff --git a/vagrant/cookbooks/apache2/templates/default/apache2.god.erb b/vagrant/cookbooks/apache2/templates/default/apache2.god.erb deleted file mode 100644 index b7315e4b..00000000 --- a/vagrant/cookbooks/apache2/templates/default/apache2.god.erb +++ /dev/null @@ -1,19 +0,0 @@ -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 diff --git a/vagrant/cookbooks/apache2/templates/default/charset.erb b/vagrant/cookbooks/apache2/templates/default/charset.erb deleted file mode 100644 index 40d7198b..00000000 --- a/vagrant/cookbooks/apache2/templates/default/charset.erb +++ /dev/null @@ -1,6 +0,0 @@ -# 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 diff --git a/vagrant/cookbooks/apache2/templates/default/default-site.erb b/vagrant/cookbooks/apache2/templates/default/default-site.erb deleted file mode 100644 index 14b25639..00000000 --- a/vagrant/cookbooks/apache2/templates/default/default-site.erb +++ /dev/null @@ -1,57 +0,0 @@ - - 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 -%> - diff --git a/vagrant/cookbooks/apache2/templates/default/mod_auth_openid.rb.erb b/vagrant/cookbooks/apache2/templates/default/mod_auth_openid.rb.erb deleted file mode 100644 index 51fc1d75..00000000 --- a/vagrant/cookbooks/apache2/templates/default/mod_auth_openid.rb.erb +++ /dev/null @@ -1,12 +0,0 @@ -#!/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 diff --git a/vagrant/cookbooks/apache2/templates/default/mods/README b/vagrant/cookbooks/apache2/templates/default/mods/README deleted file mode 100644 index df9f0bcc..00000000 --- a/vagrant/cookbooks/apache2/templates/default/mods/README +++ /dev/null @@ -1,2 +0,0 @@ -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. diff --git a/vagrant/cookbooks/apache2/templates/default/mods/alias.conf.erb b/vagrant/cookbooks/apache2/templates/default/mods/alias.conf.erb deleted file mode 100644 index 45568a57..00000000 --- a/vagrant/cookbooks/apache2/templates/default/mods/alias.conf.erb +++ /dev/null @@ -1,24 +0,0 @@ - -# -# 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 - - - diff --git a/vagrant/cookbooks/apache2/templates/default/mods/authopenid.load.erb b/vagrant/cookbooks/apache2/templates/default/mods/authopenid.load.erb deleted file mode 100644 index f21882b1..00000000 --- a/vagrant/cookbooks/apache2/templates/default/mods/authopenid.load.erb +++ /dev/null @@ -1 +0,0 @@ -LoadModule authopenid_module /usr/lib/apache2/modules/mod_auth_openid.so diff --git a/vagrant/cookbooks/apache2/templates/default/mods/autoindex.conf.erb b/vagrant/cookbooks/apache2/templates/default/mods/autoindex.conf.erb deleted file mode 100644 index 38390938..00000000 --- a/vagrant/cookbooks/apache2/templates/default/mods/autoindex.conf.erb +++ /dev/null @@ -1,101 +0,0 @@ - -# -# 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 - - diff --git a/vagrant/cookbooks/apache2/templates/default/mods/deflate.conf.erb b/vagrant/cookbooks/apache2/templates/default/mods/deflate.conf.erb deleted file mode 100644 index 2e41975f..00000000 --- a/vagrant/cookbooks/apache2/templates/default/mods/deflate.conf.erb +++ /dev/null @@ -1,16 +0,0 @@ - - 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 - diff --git a/vagrant/cookbooks/apache2/templates/default/mods/dir.conf.erb b/vagrant/cookbooks/apache2/templates/default/mods/dir.conf.erb deleted file mode 100644 index e16fcb39..00000000 --- a/vagrant/cookbooks/apache2/templates/default/mods/dir.conf.erb +++ /dev/null @@ -1,5 +0,0 @@ - - - DirectoryIndex index.html index.cgi index.pl index.php index.xhtml index.htm - - diff --git a/vagrant/cookbooks/apache2/templates/default/mods/fcgid.conf.erb b/vagrant/cookbooks/apache2/templates/default/mods/fcgid.conf.erb deleted file mode 100644 index 0e6fc9a8..00000000 --- a/vagrant/cookbooks/apache2/templates/default/mods/fcgid.conf.erb +++ /dev/null @@ -1,10 +0,0 @@ - - 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 -%> diff --git a/vagrant/cookbooks/apache2/templates/default/mods/mime.conf.erb b/vagrant/cookbooks/apache2/templates/default/mods/mime.conf.erb deleted file mode 100644 index b6954a31..00000000 --- a/vagrant/cookbooks/apache2/templates/default/mods/mime.conf.erb +++ /dev/null @@ -1,191 +0,0 @@ - - -# -# 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 - - diff --git a/vagrant/cookbooks/apache2/templates/default/mods/negotiation.conf.erb b/vagrant/cookbooks/apache2/templates/default/mods/negotiation.conf.erb deleted file mode 100644 index 0e3455bd..00000000 --- a/vagrant/cookbooks/apache2/templates/default/mods/negotiation.conf.erb +++ /dev/null @@ -1,18 +0,0 @@ - -# -# 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 - - diff --git a/vagrant/cookbooks/apache2/templates/default/mods/proxy.conf.erb b/vagrant/cookbooks/apache2/templates/default/mods/proxy.conf.erb deleted file mode 100644 index 46407a1e..00000000 --- a/vagrant/cookbooks/apache2/templates/default/mods/proxy.conf.erb +++ /dev/null @@ -1,19 +0,0 @@ - - #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 - diff --git a/vagrant/cookbooks/apache2/templates/default/mods/setenvif.conf.erb b/vagrant/cookbooks/apache2/templates/default/mods/setenvif.conf.erb deleted file mode 100644 index 6b7d6e2f..00000000 --- a/vagrant/cookbooks/apache2/templates/default/mods/setenvif.conf.erb +++ /dev/null @@ -1,28 +0,0 @@ - - -# -# 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 - - diff --git a/vagrant/cookbooks/apache2/templates/default/mods/ssl.conf.erb b/vagrant/cookbooks/apache2/templates/default/mods/ssl.conf.erb deleted file mode 100644 index 3b7735f6..00000000 --- a/vagrant/cookbooks/apache2/templates/default/mods/ssl.conf.erb +++ /dev/null @@ -1,72 +0,0 @@ - -# -# 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 - - diff --git a/vagrant/cookbooks/apache2/templates/default/mods/status.conf.erb b/vagrant/cookbooks/apache2/templates/default/mods/status.conf.erb deleted file mode 100644 index 679d1115..00000000 --- a/vagrant/cookbooks/apache2/templates/default/mods/status.conf.erb +++ /dev/null @@ -1,16 +0,0 @@ - -# -# 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 - - - diff --git a/vagrant/cookbooks/apache2/templates/default/port_apache.erb b/vagrant/cookbooks/apache2/templates/default/port_apache.erb deleted file mode 100644 index f6078dd0..00000000 --- a/vagrant/cookbooks/apache2/templates/default/port_apache.erb +++ /dev/null @@ -1,2 +0,0 @@ -# Port <%= @port %> --A FWR -p tcp -m tcp --dport <%= @port %> -j ACCEPT \ No newline at end of file diff --git a/vagrant/cookbooks/apache2/templates/default/ports.conf.erb b/vagrant/cookbooks/apache2/templates/default/ports.conf.erb deleted file mode 100644 index cc3631e1..00000000 --- a/vagrant/cookbooks/apache2/templates/default/ports.conf.erb +++ /dev/null @@ -1,6 +0,0 @@ -#This file generated via template by Chef. -<% @apache_listen_ports.each do |port| -%> -Listen <%= port %> -NameVirtualHost *:<%= port %> - -<% end -%> diff --git a/vagrant/cookbooks/apache2/templates/default/security.erb b/vagrant/cookbooks/apache2/templates/default/security.erb deleted file mode 100644 index 70c97ad3..00000000 --- a/vagrant/cookbooks/apache2/templates/default/security.erb +++ /dev/null @@ -1,50 +0,0 @@ -# -# Disable access to the entire file system except for the directories that -# are explicitly allowed later. -# -# This currently breaks the configurations that come with some web application -# Debian packages. It will be made the default for the release after lenny. -# -# -# AllowOverride None -# Order Deny,Allow -# Deny from all -# - - -# Changing the following options will not really affect the security of the -# server, but might make attacks slightly more difficult in some cases. - -# -# ServerTokens -# This directive configures what you return as the Server HTTP response -# Header. The default is 'Full' which sends information about the OS-Type -# and compiled in modules. -# Set to one of: Full | OS | Minimal | Minor | Major | Prod -# where Full conveys the most information, and Prod the least. -# -#ServerTokens Minimal -ServerTokens <%= node[:apache][:servertokens] %> - -# -# Optionally add a line containing the server version and virtual host -# name to server-generated pages (internal error documents, FTP directory -# listings, mod_status and mod_info output etc., but not CGI generated -# documents or custom error documents). -# Set to "EMail" to also include a mailto: link to the ServerAdmin. -# Set to one of: On | Off | EMail -# -#ServerSignature Off -ServerSignature <%= node[:apache][:serversignature] %> - -# -# Allow TRACE method -# -# Set to "extended" to also reflect the request body (only for testing and -# diagnostic purposes). -# -# Set to one of: On | Off | extended -# -#TraceEnable Off -TraceEnable <%= node[:apache][:traceenable] %> - diff --git a/vagrant/cookbooks/apache2/templates/default/web_app.conf.erb b/vagrant/cookbooks/apache2/templates/default/web_app.conf.erb deleted file mode 100644 index 6be3fc98..00000000 --- a/vagrant/cookbooks/apache2/templates/default/web_app.conf.erb +++ /dev/null @@ -1,43 +0,0 @@ - - ServerName <%= @params[:server_name] %> - ServerAlias <% @params[:server_aliases].each do |a| %><%= "#{a}" %> <% end %> - DocumentRoot <%= @params[:docroot] %> - RewriteEngine On - - > - Options FollowSymLinks - AllowOverride None - Order allow,deny - Allow from all - - - - Options FollowSymLinks - AllowOverride None - - - - SetHandler server-status - - Order Deny,Allow - Deny from all - Allow from 127.0.0.1 - - - LogLevel info - ErrorLog <%= node[:apache][:log_dir] %>/<%= @params[:name] %>-error.log - CustomLog <%= node[:apache][:log_dir] %>/<%= @params[:name] %>-access.log combined - - RewriteEngine On - RewriteLog <%= node[:apache][:log_dir] %>/<%= @application_name %>-rewrite.log - RewriteLogLevel 0 - - # Canonical host, <%= @params[:server_name] %> - RewriteCond %{HTTP_HOST} !^<%= @params[:server_name] %> [NC] - RewriteCond %{HTTP_HOST} !^$ - RewriteRule ^/(.*)$ http://<%= @params[:server_name] %>/$1 [L,R=301] - - RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f - RewriteCond %{SCRIPT_FILENAME} !maintenance.html - RewriteRule ^.*$ /system/maintenance.html [L] - \ No newline at end of file diff --git a/vagrant/cookbooks/apt/files/default/apt-cacher b/vagrant/cookbooks/apt/files/default/apt-cacher deleted file mode 100644 index dab94885..00000000 --- a/vagrant/cookbooks/apt/files/default/apt-cacher +++ /dev/null @@ -1,9 +0,0 @@ -# apt-cacher startup configuration file - -# IMPORTANT: check the apt-cacher.conf file before using apt-cacher as daemon. - -# set to 1 to start the daemon at boot time -AUTOSTART=1 - -# extra settings to override the ones in apt-cacher.conf -# EXTRAOPT=" daemon_port=3142 limit=30 " diff --git a/vagrant/cookbooks/apt/files/default/apt-cacher.conf b/vagrant/cookbooks/apt/files/default/apt-cacher.conf deleted file mode 100644 index 32ca3c32..00000000 --- a/vagrant/cookbooks/apt/files/default/apt-cacher.conf +++ /dev/null @@ -1,144 +0,0 @@ -# This file has been modified by ./apt-proxy-to-apt-cacher -# Some lines may have been appended at the bottom of this file -# This file has been modified by /usr/share/apt-cacher/apt-proxy-to-apt-cacher -# Some lines may have been appended at the bottom of this file -################################################################# -# This is the config file for apt-cacher. On most Debian systems -# you can safely leave the defaults alone. -################################################################# - -# cache_dir is used to set the location of the local cache. This can -# become quite large, so make sure it is somewhere with plenty of space. -cache_dir=/var/cache/apt-cacher - -# The email address of the administrator is displayed in the info page -# and traffic reports. -admin_email=root@localhost - -# For the daemon startup settings please edit the file /etc/default/apt-cacher. - -# Daemon port setting, only useful in stand-alone mode. You need to run the -# daemon as root to use privileged ports (<1024). -daemon_port = 3142 - -# optional settings, user and group to run the daemon as. Make sure they have -# sufficient permissions on the cache and log directories. Comment the settings -# to run apt-cacher as the native user. -group=www-data -user=www-data - -# optional setting, binds the listening daemon to one specified IP. Use IP -# ranges for more advanced configuration, see below. -# daemon_addr=localhost - -# If your apt-cacher machine is directly exposed to the Internet and you are -# worried about unauthorised machines fetching packages through it, you can -# specify a list of IPv4 addresses which are allowed to use it and another -# list of IPv4 addresses which aren't. -# Localhost (127.0.0.1) is always allowed. Other addresses must be matched -# by allowed_hosts and not by denied_hosts to be permitted to use the cache. -# Setting allowed_hosts to "*" means "allow all". -# Otherwise the format is a comma-separated list containing addresses, -# optionally with masks (like 10.0.0.0/22), or ranges of addresses (two -# addresses separated by a hyphen, no masks, like '192.168.0.3-192.168.0.56'). -allowed_hosts=* -denied_hosts= - -# And similiarly for IPv6 with allowed_hosts_6 and denied_hosts_6. -# Note that IPv4-mapped IPv6 addresses (::ffff:w.x.y.z) are truncated to -# w.x.y.z and are handled as IPv4. -allowed_hosts_6=fec0::/16 -denied_hosts_6= - -# This thing can be done by Apache but is much simplier here - limit access to -# Debian mirrors based on server names in the URLs -#allowed_locations=ftp.uni-kl.de,ftp.nerim.net,debian.tu-bs.de - -# Apt-cacher can generate usage reports every 24 hours if you set this -# directive to 1. You can view the reports in a web browser by pointing -# to your cache machine with '/apt-cacher/report' on the end, like this: -# http://yourcache.example.com/apt-cacher/report -# Generating reports is very fast even with many thousands of logfile -# lines, so you can safely turn this on without creating much -# additional system load. -generate_reports=1 - -# Apt-cacher can clean up its cache directory every 24 hours if you set -# this directive to 1. Cleaning the cache can take some time to run -# (generally in the order of a few minutes) and removes all package -# files that are not mentioned in any existing 'Packages' lists. This -# has the effect of deleting packages that have been superseded by an -# updated 'Packages' list. -clean_cache=1 - -# The directory to use for apt-cacher access and error logs. -# The access log records every request in the format: -# date-time|client ip address|HIT/MISS/EXPIRED|object size|object name -# The error log is slightly more free-form, and is also used for debug -# messages if debug mode is turned on. -# Note that the old 'logfile' and 'errorfile' directives are -# deprecated: if you set them explicitly they will be honoured, but it's -# better to just get rid of them from old config files. -logdir=/var/log/apt-cacher - -# apt-cacher can use different methods to decide whether package lists need to -# be updated, -# A) looking at the age of the cached files -# B) getting HTTP header from server and comparing that with cached data. This -# method is more reliable and avoids desynchronisation of data and index files -# but needs to transfer few bytes from the server every time somebody requests -# the files ("apt-get update") -# Set the following value to the maximum age (in hours) for method A or to 0 -# for method B -expire_hours=0 - -# Apt-cacher can pass all its requests to an external http proxy like -# Squid, which could be very useful if you are using an ISP that blocks -# port 80 and requires all web traffic to go through its proxy. The -# format is 'hostname:port', eg: 'proxy.example.com:8080'. -http_proxy=proxy.example.com:8080 - -# Use of an external proxy can be turned on or off with this flag. -# Value should be either 0 (off) or 1 (on). -use_proxy=0 - -# External http proxy sometimes need authentication to get full access. The -# format is 'username:password'. -http_proxy_auth=proxyuser:proxypass - -# Use of external proxy authentication can be turned on or off with this flag. -# Value should be either 0 (off) or 1 (on). -use_proxy_auth=0 - -# Rate limiting sets the maximum bandwidth in bytes per second to use -# for fetching packages. Syntax is fully defined in 'man wget'. -# Use 'k' or 'm' to use kilobits or megabits / second: eg, 'limit=25k'. -# Use 0 or a negative value for no rate limiting. -limit=0 - -# Debug mode makes apt-cacher spew a lot of extra debug junk to the -# error log (whose location is defined with the 'logdir' directive). -# Leave this off unless you need it, or your error log will get very -# big. Acceptable values are 0 or 1. -debug=0 - -# Adapt the line in the usage info web page to match your server configuration -# example_sources_line=deb http://my.cacher.server:3142/ftp.au.debian.org/debian unstable main contrib non-free - -# Print a 410 (Gone) HTTP message with the specified text when accessed via -# CGI. Useful to tell users to adapt their sources.list files when the -# apt-cacher server is beeing relocated (via apt-get's error messages while -# running "update") -#cgi_advise_to_use = Please use http://cacheserver:3142/ as apt-cacher access URL -#cgi_advise_to_use = Server relocated. To change sources.list, run perl -pe "s,/apt-cacher\??,:3142," -i /etc/apt/sources.list - -# Server mapping - this allows to hide real server names behind virtual paths -# that appear in the access URL. This method is known from apt-proxy. This is -# also the only method to use FTP access to the target hosts. The syntax is simple, the part of the beginning to replace, followed by a list of mirror urls, all space separated. Multiple profile are separated by semicolons -# path_map = debian ftp.uni-kl.de/pub/linux/debian ftp2.de.debian.org/debian ; ubuntu archive.ubuntu.com/ubuntu ; security security.debian.org/debian-security ftp2.de.debian.org/debian-security -# Note that you need to specify all target servers in the allowed_locations -# options if you make use of it. Also note that the paths should not overlap -# each other. FTP access method not supported yet, maybe in the future. - -# extra setting from apt-proxy configuration -path_map = ubuntu us.archive.ubuntu.com/ubuntu ; ubuntu-security security.ubuntu.com/ubuntu ; debian debian.osuosl.org/debian/ ; security security.debian.org/debian-security diff --git a/vagrant/cookbooks/apt/files/default/apt-proxy-v2.conf b/vagrant/cookbooks/apt/files/default/apt-proxy-v2.conf deleted file mode 100644 index 6541f25e..00000000 --- a/vagrant/cookbooks/apt/files/default/apt-proxy-v2.conf +++ /dev/null @@ -1,50 +0,0 @@ -[DEFAULT] -;; All times are in seconds, but you can add a suffix -;; for minutes(m), hours(h) or days(d) - -;; commented out address so apt-proxy will listen on all IPs -;; address = 127.0.0.1 -port = 9999 -cache_dir = /var/cache/apt-proxy - -;; Control files (Packages/Sources/Contents) refresh rate -min_refresh_delay = 1s -complete_clientless_downloads = 1 - -;; Debugging settings. -debug = all:4 db:0 - -time = 30 -passive_ftp = on - -;;-------------------------------------------------------------- -;; Cache housekeeping - -cleanup_freq = 1d -max_age = 120d -max_versions = 3 - -;;--------------------------------------------------------------- -;; Backend servers -;; -;; Place each server in its own [section] - -[ubuntu] -; Ubuntu archive -backends = - http://us.archive.ubuntu.com/ubuntu - -[ubuntu-security] -; Ubuntu security updates -backends = http://security.ubuntu.com/ubuntu - -[debian] -;; Backend servers, in order of preference -backends = - http://debian.osuosl.org/debian/ - -[security] -;; Debian security archive -backends = - http://security.debian.org/debian-security - http://ftp2.de.debian.org/debian-security diff --git a/vagrant/cookbooks/apt/metadata.json b/vagrant/cookbooks/apt/metadata.json deleted file mode 100644 index 00a5b188..00000000 --- a/vagrant/cookbooks/apt/metadata.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "dependencies": { - }, - "replacing": { - }, - "description": "Configures apt and apt services", - "groupings": { - }, - "platforms": { - "ubuntu": [ - - ], - "debian": [ - - ] - }, - "version": "0.8.0", - "recommendations": { - }, - "name": "apt", - "maintainer": "Opscode, Inc.", - "long_description": "", - "recipes": { - "apt::proxy": "Set up an APT proxy", - "apt::cacher": "Set up an APT cache" - }, - "suggestions": { - }, - "maintainer_email": "cookbooks@opscode.com", - "attributes": { - }, - "conflicting": { - }, - "license": "Apache 2.0", - "providing": { - } - } \ No newline at end of file diff --git a/vagrant/cookbooks/apt/metadata.rb b/vagrant/cookbooks/apt/metadata.rb deleted file mode 100644 index cb6e712a..00000000 --- a/vagrant/cookbooks/apt/metadata.rb +++ /dev/null @@ -1,11 +0,0 @@ -maintainer "Opscode, Inc." -maintainer_email "cookbooks@opscode.com" -license "Apache 2.0" -description "Configures apt and apt services" -version "0.8" -recipe "apt::cacher", "Set up an APT cache" -recipe "apt::proxy", "Set up an APT proxy" - -%w{ ubuntu debian }.each do |os| - supports os -end diff --git a/vagrant/cookbooks/apt/recipes/cacher.rb b/vagrant/cookbooks/apt/recipes/cacher.rb deleted file mode 100644 index 23774083..00000000 --- a/vagrant/cookbooks/apt/recipes/cacher.rb +++ /dev/null @@ -1,42 +0,0 @@ -# -# Cookbook Name:: apt -# Recipe:: cacher -# -# 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 "apt-cacher" do - action :install -end - -service "apt-cacher" do - supports :restart => true, :status => false - action [ :enable, :start ] -end - -remote_file "/etc/apt-cacher/apt-cacher.conf" do - source "apt-cacher.conf" - owner "root" - group "root" - mode 0644 - notifies :restart, resources(:service => "apt-cacher") -end - -remote_file "/etc/default/apt-cacher" do - source "apt-cacher" - owner "root" - group "root" - mode 0644 - notifies :restart, resources(:service => "apt-cacher") -end diff --git a/vagrant/cookbooks/apt/recipes/default.rb b/vagrant/cookbooks/apt/recipes/default.rb deleted file mode 100644 index d1117a7b..00000000 --- a/vagrant/cookbooks/apt/recipes/default.rb +++ /dev/null @@ -1,33 +0,0 @@ -# -# Cookbook Name:: apt -# Recipe:: default -# -# 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. -# - -e = execute "apt-get update" do - action :nothing -end - -e.run_action(:run) - -%w{/var/cache/local /var/cache/local/preseeding}.each do |dirname| - directory dirname do - owner "root" - group "root" - mode 0755 - action :create - end -end diff --git a/vagrant/cookbooks/apt/recipes/proxy.rb b/vagrant/cookbooks/apt/recipes/proxy.rb deleted file mode 100644 index 3eede34a..00000000 --- a/vagrant/cookbooks/apt/recipes/proxy.rb +++ /dev/null @@ -1,34 +0,0 @@ -# -# Cookbook Name:: apt -# 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. -# -package "apt-proxy" do - action :install -end - -service "apt-proxy" do - supports :restart => true, :status => false - action [ :enable, :start ] -end - -remote_file "/etc/apt-proxy/apt-proxy-v2.conf" do - source "apt-proxy-v2.conf" - owner "root" - group "root" - mode 0644 - notifies :restart, resources(:service => "apt-proxy") -end diff --git a/vagrant/cookbooks/build-essential/.gitignore b/vagrant/cookbooks/build-essential/.gitignore deleted file mode 100644 index fc5b76d4..00000000 --- a/vagrant/cookbooks/build-essential/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.bundle -.cache -.kitchen -bin diff --git a/vagrant/cookbooks/build-essential/CHANGELOG.md b/vagrant/cookbooks/build-essential/CHANGELOG.md deleted file mode 100644 index 4149decf..00000000 --- a/vagrant/cookbooks/build-essential/CHANGELOG.md +++ /dev/null @@ -1,35 +0,0 @@ -## v1.3.4: - -* [COOK-2272] - Complete `platform_family` conversion in build-essential - -## v1.3.2: - -* [COOK-2069] - build-essential will install osx-gcc-installer when - Xcode is present - -## v1.3.0: - - * [COOK-1895] - support smartos - -## v1.2.0: - -* Add test-kitchen support (source repo only) -* [COOK-1677] - build-essential cookbook support for OpenSuse and SLES -* [COOK-1718] - build-essential cookbook metadata should include scientific -* [COOK-1768] - The apt-get update in build-essentials needs to be renamed - -## v1.1.2: - -* [COOK-1620] - support OS X 10.8 - -## v1.1.0: - -* [COOK-1098] - support amazon linux -* [COOK-1149] - support Mac OS X -* [COOK-1296] - allow for compile-time installation of packages - through an attribute (see README) - -## v1.0.2: - -* [COOK-1098] - Add Amazon Linux platform support -* [COOK-1149] - Add OS X platform support diff --git a/vagrant/cookbooks/build-essential/CONTRIBUTING b/vagrant/cookbooks/build-essential/CONTRIBUTING deleted file mode 100644 index 89ac873b..00000000 --- a/vagrant/cookbooks/build-essential/CONTRIBUTING +++ /dev/null @@ -1,29 +0,0 @@ -If you would like to contribute, please open a ticket in JIRA: - -* http://tickets.opscode.com - -Create the ticket in the COOK project and use the cookbook name as the -component. - -For all code contributions, we ask that contributors sign a -contributor license agreement (CLA). Instructions may be found here: - -* http://wiki.opscode.com/display/chef/How+to+Contribute - -When contributing changes to individual cookbooks, please do not -modify the version number in the metadata.rb. Also please do not -update the CHANGELOG.md for a new version. Not all changes to a -cookbook may be merged and released in the same versions. Opscode will -handle the version updates during the release process. You are welcome -to correct typos or otherwise make updates to documentation in the -README. - -If a contribution adds new platforms or platform versions, indicate -such in the body of the commit message(s), and update the relevant -COOK ticket. When writing commit messages, it is helpful for others if -you indicate the COOK ticket. For example: - - git commit -m '[COOK-1041] Updated pool resource to correctly delete.' - -In the ticket itself, it is also helpful if you include log output of -a successful Chef run, but this is not absolutely required. diff --git a/vagrant/cookbooks/build-essential/Gemfile b/vagrant/cookbooks/build-essential/Gemfile deleted file mode 100644 index 5586844c..00000000 --- a/vagrant/cookbooks/build-essential/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source :rubygems - -gem 'test-kitchen', '<= 1.0' diff --git a/vagrant/cookbooks/build-essential/LICENSE b/vagrant/cookbooks/build-essential/LICENSE deleted file mode 100644 index 11069edd..00000000 --- a/vagrant/cookbooks/build-essential/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -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. diff --git a/vagrant/cookbooks/build-essential/README.md b/vagrant/cookbooks/build-essential/README.md deleted file mode 100644 index b3b8fb05..00000000 --- a/vagrant/cookbooks/build-essential/README.md +++ /dev/null @@ -1,131 +0,0 @@ -Description -=========== - -Installs packages required for compiling C software from source. Use -this cookbook if you wish to compile C programs, or install RubyGems -with native extensions. - -Requirements -============ - -Chef version 0.10.10+ and Ohai 0.6.12+ are required. - -## Platform - -Supported platforms by platform family: - -* Linux (fedora redhat centos ubuntu debian amazon scientific) -* Darwin (`mac_os_x` 10.6+) -* SmartOs - -## Cookbooks - -Requires `pkgin` cookbook on SmartOS - -Attributes -========== - -* `node['build_essential']['compiletime']` - Whether the resources in -the default recipe should be configured at the "Compile" phase of the -Chef run. Defaults to false, see __Usage__ for more information. -* `node['build_essential']['osx']['gcc_installer_url']` - The URL of - the OS X GCC package installer (.pkg). -* `node['build_essential']['osx']['gcc_installer_checksum']` - The - SHA256 checksum of the OS X GCC installer. - -Recipes -======= - -This cookbook has one recipe, default. - -On Linux platforms (see __Platform__ above for a supported list of -families), packages required to build C source projects are installed. -This includes GCC, make, autconf and others. On Debian-family -distributions, the apt-cache may need to be updated, especially during -compile time installation. See __Usage__ for further information. - -On Mac OS X, the GCC standalone installer by Kenneth Reitz is -installed. Note that this is *not* the Xcode CLI package, as that does -not include all programs and headers required to build some common -GNU-style C projects, such as those that are available from projects -such as MacPorts or Homebrew. Changing the attributes for the GCC -installer URL and checksum to the Xcode values may work, but this is -untested. - -Usage -===== - -Simply include the `build-essential` and the required tools will be -installed to the system, and later recipes will be able to compile -software from C source code. - -For RubyGems that include native C extensions you wish to use with -Chef, you should do two things. - -0. Ensure that the C libraries, include files and other assorted "dev" -type packages are installed. You should do this in the compile phase -after the build-essential recipe. -1. Use the `chef_gem` resource in your recipes. This requires Chef version 0.10.10+. -2. Set the `compiletime` attribute in roles where such recipes are -required. This will ensure that the build tools are available to -compile the RubyGems' extensions, as `chef_gem` happens during the -compile phase, too. - -Example installation of a devel package at compile-time in a recipe: - - package "mypackage-dev" do - action :nothing - end.run_action(:install) - -Example use of `chef_gem`: - - chef_gem "mygem" - -Example role: - - name "myapp" - run_list( - "recipe[build-essential]", - "recipe[myapp]" - ) - default_attributes( - "build_essential" => { - "compiletime" => true - } - ) - -The compile time option (via the attribute) is to ensure that the -proper packages are available at the right time in the Chef run. It is -recommended that the build-essential recipe appear early in the run -list. - -The Chef wiki has documentation on -[the anatomy of a chef run](http://wiki.opscode.com/display/chef/Anatomy+of+a+Chef+Run). - -Limitations -=========== - -It is not in the scope of this cookbook to handle installing the -required headers for individual software projects in order to compile -them, or to compile RubyGems with native C extensions. You should -create a cookbook for handling that. - -License and Author -================== - -Author:: Joshua Timberman () -Author:: Seth Chisamore () - -Copyright 2009-2011, 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. diff --git a/vagrant/cookbooks/build-essential/attributes/default.rb b/vagrant/cookbooks/build-essential/attributes/default.rb deleted file mode 100644 index f45750f0..00000000 --- a/vagrant/cookbooks/build-essential/attributes/default.rb +++ /dev/null @@ -1,33 +0,0 @@ -# -# Cookbook Name:: build-essential -# Attributes:: default -# -# Copyright 2008-2012, 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. -# - -default['build_essential']['compiletime'] = false - -case node['platform_family'] -when "mac_os_x" - case - when Chef::VersionConstraint.new("~> 10.7.0").include?(node['platform_version']), - Chef::VersionConstraint.new("~> 10.8.0").include?(node['platform_version']) - default['build_essential']['osx']['gcc_installer_url'] = "https://github.com/downloads/kennethreitz/osx-gcc-installer/GCC-10.7-v2.pkg" - default['build_essential']['osx']['gcc_installer_checksum'] = "df36aa87606feb99d0db9ac9a492819e" - when Chef::VersionConstraint.new("~> 10.6.0").include?(node['platform_version']) - default['build_essential']['osx']['gcc_installer_url'] = "https://github.com/downloads/kennethreitz/osx-gcc-installer/GCC-10.6.pkg" - default['build_essential']['osx']['gcc_installer_checksum'] = "d1db5bab6a3f6b9f3b5577a130baeefa" - end -end diff --git a/vagrant/cookbooks/build-essential/metadata.json b/vagrant/cookbooks/build-essential/metadata.json deleted file mode 100644 index e9301a78..00000000 --- a/vagrant/cookbooks/build-essential/metadata.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "build-essential", - "description": "Installs C compiler / build tools", - "long_description": "", - "maintainer": "Opscode, Inc.", - "maintainer_email": "cookbooks@opscode.com", - "license": "Apache 2.0", - "platforms": { - "fedora": ">= 0.0.0", - "redhat": ">= 0.0.0", - "centos": ">= 0.0.0", - "ubuntu": ">= 0.0.0", - "debian": ">= 0.0.0", - "amazon": ">= 0.0.0", - "suse": ">= 0.0.0", - "scientific": ">= 0.0.0", - "oracle": ">= 0.0.0", - "smartos": ">= 0.0.0", - "mac_os_x": ">= 10.6.0", - "mac_os_x_server": ">= 10.6.0" - }, - "dependencies": { - }, - "recommendations": { - }, - "suggestions": { - "pkgin": ">= 0.0.0" - }, - "conflicting": { - }, - "providing": { - }, - "replacing": { - }, - "attributes": { - }, - "groupings": { - }, - "recipes": { - "build-essential": "Installs packages required for compiling C software from source." - }, - "version": "1.3.4" -} \ No newline at end of file diff --git a/vagrant/cookbooks/build-essential/metadata.rb b/vagrant/cookbooks/build-essential/metadata.rb deleted file mode 100644 index 70b6add3..00000000 --- a/vagrant/cookbooks/build-essential/metadata.rb +++ /dev/null @@ -1,15 +0,0 @@ -name "build-essential" -maintainer "Opscode, Inc." -maintainer_email "cookbooks@opscode.com" -license "Apache 2.0" -description "Installs C compiler / build tools" -version "1.3.4" -recipe "build-essential", "Installs packages required for compiling C software from source." - -%w{ fedora redhat centos ubuntu debian amazon suse scientific oracle smartos}.each do |os| - supports os -end - -supports "mac_os_x", ">= 10.6.0" -supports "mac_os_x_server", ">= 10.6.0" -suggests "pkgin" diff --git a/vagrant/cookbooks/build-essential/recipes/default.rb b/vagrant/cookbooks/build-essential/recipes/default.rb deleted file mode 100644 index 4eff3738..00000000 --- a/vagrant/cookbooks/build-essential/recipes/default.rb +++ /dev/null @@ -1,92 +0,0 @@ -# -# Cookbook Name:: build-essential -# Recipe:: default -# -# 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. -# - -require 'chef/shell_out' - -compiletime = node['build_essential']['compiletime'] - -case node['platform_family'] -when "rhel", "suse", "fedora", "debian" - - # on apt-based platforms when first provisioning we need to force - # apt-get update at compiletime if we are going to try to install at compiletime - if node['platform_family'] == "debian" - execute "apt-get-update-build-essentials" do - command "apt-get update" - action :nothing - # tip: to suppress this running every time, just use the apt cookbook - not_if do - ::File.exists?('/var/lib/apt/periodic/update-success-stamp') && - ::File.mtime('/var/lib/apt/periodic/update-success-stamp') > Time.now - 86400*2 - end - end.run_action(:run) if compiletime - end - - packages = case node['platform_family'] - when "debian" - %w{build-essential binutils-doc} - when "rhel", "fedora" - %w{gcc gcc-c++ kernel-devel make} - when "suse" - %w{gcc gcc-c++ kernel-default-devel make m4} # in SLES there is no kernel-devel - end - - packages.each do |pkg| - r = package pkg do - action ( compiletime ? :nothing : :install ) - end - r.run_action(:install) if compiletime - end - - %w{autoconf flex bison}.each do |pkg| - r = package pkg do - action ( compiletime ? :nothing : :install ) - end - r.run_action(:install) if compiletime - end - -when "smartos" - include_recipe 'pkgin' - %w{gcc47 gcc47-runtime scmgit-base gmake pkg-config binutils}.each do |package| - pkgin_package package do - action :install - end - end - -when "mac_os_x" - result = Chef::ShellOut.new("pkgutil --pkgs").run_command - osx_gcc_installer_installed = result.stdout.split("\n").include?("com.apple.pkg.gcc4.2Leo") - developer_tools_cli_installed = result.stdout.split("\n").include?("com.apple.pkg.DeveloperToolsCLI") - pkg_filename = File.basename(node['build_essential']['osx']['gcc_installer_url']) - pkg_path = "#{Chef::Config[:file_cache_path]}/#{pkg_filename}" - - r = remote_file pkg_path do - source node['build_essential']['osx']['gcc_installer_url'] - checksum node['build_essential']['osx']['gcc_installer_checksum'] - action ( compiletime ? :nothing : :create ) - not_if { osx_gcc_installer_installed or developer_tools_cli_installed } - end - r.run_action(:create) if compiletime - - r = execute "sudo installer -pkg \"#{pkg_path}\" -target /" do - action ( compiletime ? :nothing : :run ) - not_if { osx_gcc_installer_installed or developer_tools_cli_installed } - end - r.run_action(:run) if compiletime -end diff --git a/vagrant/cookbooks/git/.gitignore b/vagrant/cookbooks/git/.gitignore deleted file mode 100755 index 7beac451..00000000 --- a/vagrant/cookbooks/git/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -.bundle -.cache -.kitchen -bin -Gemfile.lock diff --git a/vagrant/cookbooks/git/CHANGELOG.md b/vagrant/cookbooks/git/CHANGELOG.md deleted file mode 100755 index c8622963..00000000 --- a/vagrant/cookbooks/git/CHANGELOG.md +++ /dev/null @@ -1,59 +0,0 @@ -## v2.2.0: - -* [COOK-2303] - git::server support for RHEL platform_family - -## v2.1.4: - -* [COOK-2110] - initial test-kitchen support (only available in GitHub - repository). -* [COOK-2253] - pin runit dependency - -## v2.1.2: - -* [COOK-2043] - install git on ubuntu 12.04 not git-core - -## v2.1.0: - -The repository didn't have pushed commits, and so the following -changes from earlier-than-latest versions wouldn't be available on the -community site. We're releasing 2.1.0 to correct this. - -* [COOK-1943] - Update to git 1.8.0 -* [COOK-2020] - Add setup option attributes to Git Windows package - install - -## v2.0.0: - -This version uses platform_family attribute, making the cookbook incompatible -with older versions of Chef/Ohai, hence the major version bump. - -* [COOK-1668] - git cookbook fails to run due to bad platform_family - call -* [COOK-1759] - git::source needs additional package for rhel - platform_family - -## v1.1.2: - -* [COOK-2020] - Add setup option attributes to Git Windows package - install - -## v1.1.0: - -* [COOK-1943] - Update to git 1.8.0 - -## v1.0.2: - -* [COOK-1537] - add recipe for source installation - -## v1.0.0: - -* [COOK-1152] - Add support for Mac OS X -* [COOK-1112] - Add support for Windows - -## v0.10.0: - -* [COOK-853] - Git client installation on CentOS - -## v0.9.0: - -* Current public release. diff --git a/vagrant/cookbooks/git/CONTRIBUTING b/vagrant/cookbooks/git/CONTRIBUTING deleted file mode 100755 index 89ac873b..00000000 --- a/vagrant/cookbooks/git/CONTRIBUTING +++ /dev/null @@ -1,29 +0,0 @@ -If you would like to contribute, please open a ticket in JIRA: - -* http://tickets.opscode.com - -Create the ticket in the COOK project and use the cookbook name as the -component. - -For all code contributions, we ask that contributors sign a -contributor license agreement (CLA). Instructions may be found here: - -* http://wiki.opscode.com/display/chef/How+to+Contribute - -When contributing changes to individual cookbooks, please do not -modify the version number in the metadata.rb. Also please do not -update the CHANGELOG.md for a new version. Not all changes to a -cookbook may be merged and released in the same versions. Opscode will -handle the version updates during the release process. You are welcome -to correct typos or otherwise make updates to documentation in the -README. - -If a contribution adds new platforms or platform versions, indicate -such in the body of the commit message(s), and update the relevant -COOK ticket. When writing commit messages, it is helpful for others if -you indicate the COOK ticket. For example: - - git commit -m '[COOK-1041] Updated pool resource to correctly delete.' - -In the ticket itself, it is also helpful if you include log output of -a successful Chef run, but this is not absolutely required. diff --git a/vagrant/cookbooks/git/Gemfile b/vagrant/cookbooks/git/Gemfile deleted file mode 100755 index 46e07661..00000000 --- a/vagrant/cookbooks/git/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source :rubygems - -gem 'test-kitchen', '< 1.0' diff --git a/vagrant/cookbooks/git/LICENSE b/vagrant/cookbooks/git/LICENSE deleted file mode 100755 index 11069edd..00000000 --- a/vagrant/cookbooks/git/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -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. diff --git a/vagrant/cookbooks/git/README.md b/vagrant/cookbooks/git/README.md deleted file mode 100755 index e14e8f5a..00000000 --- a/vagrant/cookbooks/git/README.md +++ /dev/null @@ -1,115 +0,0 @@ -Description -=========== - -Installs git and optionally sets up a git server as a daemon under runit. - -Requirements -============ -## Ohai and Chef: - -* Ohai: 6.14.0+ - -This cookbook makes use of `node['platform_family']` to simplify platform -selection logic. This attribute was introduced in Ohai v0.6.12. - -## Platform: - -The following platform families are supported: - -* Debian -* Arch -* RHEL -* Fedora -* Mac OS X (10.6.0+) -* Windows - -## Cookbooks: - -* runit (for `git::server`) -* build-essential (for `git::source`) -* dmg (for OS X installation) -* yum (for RHEL 5 installation) - -### Windows Dependencies -The [`windows_package`](https://github.com/opscode-cookbooks/windows#windows_package) resource from the Windows cookbook is required to -install the git package on Windows. - -## Attributes - -### default -The following attributes are platform-specific. - -#### Windows - -* `node['git']['version']` - git version to install -* `node['git']['url']` - URL to git package -* `node['git']['checksum']` - package SHA256 checksum -* `node['git']['display_name']` - `windows_package` resource Display Name (makes the package install idempotent) - -#### Mac OS X - -* `node['git']['osx_dmg']['url']` - URL to git package -* `node['git']['osx_dmg']['checksum']` - package SHA256 checksum - -#### Linux - -* `node['git']['prefix']` - git install directory -* `node['git']['version']` - git version to install -* `node['git']['url']` - URL to git tarball -* `node['git']['checksum']` - tarball SHA256 checksum - -Recipes -======= - -## default - -Installs base git packages based on platform. - -## server - -Sets up a git daemon to provide a server. - -## source - -Installs git from source. - -## windows - -Installs git client on Windows - -Usage -===== - - -This cookbook primarily installs git core packages. It can also be -used to serve git repositories. - -To install git client (all supported platforms): - - include_recipe 'git' - -To install git server: - - include_recipe "git::server" - -This creates the directory specified by git/server/base_path (default is /srv/git) -and starts a git daemon, exporting all repositories found. Repositories need to be -added manually, but will be available once they are created. - -License and Author -================== - -- Author:: Joshua Timberman () -- Copyright:: 2009-2012, 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. diff --git a/vagrant/cookbooks/git/attributes/default.rb b/vagrant/cookbooks/git/attributes/default.rb deleted file mode 100755 index cc632b6b..00000000 --- a/vagrant/cookbooks/git/attributes/default.rb +++ /dev/null @@ -1,40 +0,0 @@ -# -# Author:: Jamie Winsor () -# Cookbook Name:: git -# Attributes:: default -# -# Copyright 2008-2012, 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_family'] -when 'windows' - default['git']['version'] = "1.8.0-preview20121022" - default['git']['url'] = "http://github.com/downloads/msysgit/git/Git-#{node['git']['version']}.exe" - default['git']['checksum'] = "8ec19d04912fd27d7350823c857a4807b550fa63a3744bf6fd2841de8cfa9a0f" - default['git']['display_name'] = "Git version #{ node['git']['version'] }" -when "mac_os_x" - default['git']['osx_dmg']['app_name'] = "git-1.8.0-intel-universal-snow-leopard" - default['git']['osx_dmg']['volumes_dir'] = "Git 1.8.0 Snow Leopard Intel Universal" - default['git']['osx_dmg']['package_id'] = "GitOSX.Installer.git180.git.pkg" - default['git']['osx_dmg']['url'] = "https://github.com/downloads/timcharper/git_osx_installer/git-1.8.0-intel-universal-snow-leopard.dmg" - default['git']['osx_dmg']['checksum'] = "da83499f3305061792358bec26c20faa997b7ad9990713d1be2b03cbb5fbce12" -else - default['git']['prefix'] = "/usr/local" - default['git']['version'] = "1.8.0" - default['git']['url'] = "https://github.com/git/git/tarball/v#{node['git']['version']}" - default['git']['checksum'] = "24f1895fa74a23b3d9233fa89a9ef04d83a1cd952d659720d6ea231bbd0c973c" -end - -default['git']['server']['base_path'] = "/srv/git" -default['git']['server']['export_all'] = "true" \ No newline at end of file diff --git a/vagrant/cookbooks/git/metadata.rb b/vagrant/cookbooks/git/metadata.rb deleted file mode 100755 index 1964b6dc..00000000 --- a/vagrant/cookbooks/git/metadata.rb +++ /dev/null @@ -1,35 +0,0 @@ -name "git" -maintainer "Opscode, Inc." -maintainer_email "cookbooks@opscode.com" -license "Apache 2.0" -description "Installs git and/or sets up a Git server daemon" -long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "2.2.1" -recipe "git", "Installs git" -recipe "git::server", "Sets up a runit_service for git daemon" -recipe "git::source", "Installs git from source" - -%w{ amazon arch centos debian fedora redhat scientific oracle amazon ubuntu windows }.each do |os| - supports os -end - -supports "mac_os_x", ">= 10.6.0" - -%w{ dmg build-essential yum windows }.each do |cookbook| - depends cookbook -end - -depends "runit", "~> 1.0" - -attribute "git/server/base_path", - :display_name => "Git Daemon Base Path", - :description => "A directory containing git repositories to be exposed by the git-daemon", - :default => "/srv/git", - :recipes => ["git::server"] - -attribute "git/server/export_all", - :display_name => "Git Daemon Export All", - :description => "Adds the --export-all option to the git-daemon parameters, making all repositories publicly readable even if they lack the \"git-daemon-export-ok\" file", - :choice => ["true", "false"], - :default => "true", - :recipes => ["git::server"] diff --git a/vagrant/cookbooks/git/recipes/default.rb b/vagrant/cookbooks/git/recipes/default.rb deleted file mode 100755 index 933face6..00000000 --- a/vagrant/cookbooks/git/recipes/default.rb +++ /dev/null @@ -1,46 +0,0 @@ -# -# Cookbook Name:: git -# Recipe:: default -# -# 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_family'] -when "debian" - if node['platform'] == "ubuntu" && node['platform_version'].to_f < 10.10 - package "git-core" - else - package "git" - end -when "rhel","fedora" - case node['platform_version'].to_i - when 5 - include_recipe "yum::epel" - end - package "git" -when "windows" - include_recipe 'git::windows' -when "mac_os_x" - dmg_package "GitOSX-Installer" do - app node['git']['osx_dmg']['app_name'] - package_id node['git']['osx_dmg']['package_id'] - volumes_dir node['git']['osx_dmg']['volumes_dir'] - source node['git']['osx_dmg']['url'] - checksum node['git']['osx_dmg']['checksum'] - type "pkg" - action :install - end -else - package "git" -end diff --git a/vagrant/cookbooks/git/recipes/server.rb b/vagrant/cookbooks/git/recipes/server.rb deleted file mode 100755 index b67461c0..00000000 --- a/vagrant/cookbooks/git/recipes/server.rb +++ /dev/null @@ -1,57 +0,0 @@ -# -# Cookbook Name:: git -# Recipe:: server -# -# Copyright 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 node["platform"] == "windows" - return "#{node['platform']} is not supported by the #{cookbook_name}::#{recipe_name} recipe" -end - -include_recipe "git" - -directory node["git"]["server"]["base_path"] do - owner "root" - group "root" - mode 00755 -end - -case node['platform_family'] -when "debian" - include_recipe "runit" - - package "git-daemon-run" - - runit_service "git-daemon" do - sv_templates false - end -when "rhel" - package "git-daemon" - - template "/etc/xinetd.d/git" do - backup false - source "git-xinetd.d.erb" - owner "root" - group "root" - mode 00644 - end - - service "xinetd" do - action [:enable, :restart] - end -else - log "Platform requires setting up a git daemon service script." - log "Hint: /usr/bin/git daemon --export-all --user=nobody --group=daemon --base-path=#{node["git"]["server"]["base_path"]}" -end diff --git a/vagrant/cookbooks/git/recipes/source.rb b/vagrant/cookbooks/git/recipes/source.rb deleted file mode 100755 index e85c9892..00000000 --- a/vagrant/cookbooks/git/recipes/source.rb +++ /dev/null @@ -1,48 +0,0 @@ -# -# Cookbook Name:: git -# Recipe:: source -# -# Copyright 2012, Brian Flad, Fletcher Nichol -# -# 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 node["platform"] == "windows" - return "#{node['platform']} is not supported by the #{cookbook_name}::#{recipe_name} recipe" -end - -include_recipe "build-essential" - -pkgs = value_for_platform_family( - ["rhel"] => %w{ expat-devel gettext-devel libcurl-devel openssl-devel perl-ExtUtils-MakeMaker zlib-devel } -) - -pkgs.each do |pkg| - package pkg -end - -remote_file "#{Chef::Config['file_cache_path']}/git-#{node['git']['version']}.tar.gz" do - source node['git']['url'] - checksum node['git']['checksum'] - mode 00644 - not_if "test -f #{Chef::Config['file_cache_path']}/git-#{node['git']['version']}.tar.gz" -end - -execute "Extracting and Building Git #{node['git']['version']} from Source" do - cwd Chef::Config['file_cache_path'] - command <<-COMMAND - (mkdir git-#{node['git']['version']} && tar -zxf git-#{node['git']['version']}.tar.gz -C git-#{node['git']['version']} --strip-components 1) - (cd git-#{node['git']['version']} && make prefix=#{node['git']['prefix']} install) - COMMAND - creates "node['git']['prefix']}/bin/git" - not_if "git --version | grep #{node['git']['version']}" -end diff --git a/vagrant/cookbooks/git/recipes/windows.rb b/vagrant/cookbooks/git/recipes/windows.rb deleted file mode 100755 index 957b94bb..00000000 --- a/vagrant/cookbooks/git/recipes/windows.rb +++ /dev/null @@ -1,32 +0,0 @@ -# -# Cookbook Name:: git -# Recipe:: windows -# -# 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. - -windows_package node['git']['display_name'] do - action :install - source node['git']['url'] - checksum node['git']['checksum'] - installer_type :inno -end - -# Git is installed to Program Files (x86) on 64-bit machines and -# 'Program Files' on 32-bit machines -PROGRAM_FILES = ENV['ProgramFiles(x86)'] || ENV['ProgramFiles'] - -windows_path "#{ PROGRAM_FILES }\\Git\\Cmd" do - action :add -end diff --git a/vagrant/cookbooks/git/templates/default/git-xinetd.d.erb b/vagrant/cookbooks/git/templates/default/git-xinetd.d.erb deleted file mode 100755 index e3cf2e6a..00000000 --- a/vagrant/cookbooks/git/templates/default/git-xinetd.d.erb +++ /dev/null @@ -1,10 +0,0 @@ -service git -{ - disable = no - socket_type = stream - wait = no - user = nobody - server = /usr/libexec/git-core/git-daemon - server_args = --base-path=<%= node["git"]["server"]["base_path"] %> <% if node["git"]["server"]["export_all"] == "true" %>--export-all <% end %>--syslog --inetd --verbose - log_on_failure += USERID -} diff --git a/vagrant/cookbooks/git/templates/default/sv-git-daemon-log-run.erb b/vagrant/cookbooks/git/templates/default/sv-git-daemon-log-run.erb deleted file mode 100755 index a79a518f..00000000 --- a/vagrant/cookbooks/git/templates/default/sv-git-daemon-log-run.erb +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec svlogd -tt ./main diff --git a/vagrant/cookbooks/git/templates/default/sv-git-daemon-run.erb b/vagrant/cookbooks/git/templates/default/sv-git-daemon-run.erb deleted file mode 100755 index 123d7d84..00000000 --- a/vagrant/cookbooks/git/templates/default/sv-git-daemon-run.erb +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -exec 2>&1 -exec /usr/bin/git daemon <% if node["git"]["server"]["export_all"] == "true" %>--export-all <% end %>--user=nobody --group=daemon --syslog --base-path=<%= node["git"]["server"]["base_path"] %> <%= node["git"]["server"]["base_path"] %> diff --git a/vagrant/cookbooks/nodejs/.gitignore b/vagrant/cookbooks/nodejs/.gitignore deleted file mode 100755 index 6f13b69f..00000000 --- a/vagrant/cookbooks/nodejs/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Gemfile.lock -Berksfile.lock -tmp/ -.jamie/ -.jamie.local.yml diff --git a/vagrant/cookbooks/nodejs/.jamie.yml b/vagrant/cookbooks/nodejs/.jamie.yml deleted file mode 100755 index 7b6cea71..00000000 --- a/vagrant/cookbooks/nodejs/.jamie.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -driver_plugin: vagrant -driver_config: - customize: - memory: 512 - cpus: 4 -platforms: -- name: ubuntu-12.04 - driver_config: - box: opscode-ubuntu-12.04 - box_url: https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04.box - run_list: - - recipe[apt] -- name: ubuntu-10.04 - driver_config: - box: opscode-ubuntu-10.04 - box_url: https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-10.04.box - run_list: - - recipe[apt] -- name: centos-6.3 - driver_config: - box: opscode-centos-6.3 - box_url: https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-centos-6.3.box -- name: centos-5.8 - driver_config: - box: opscode-centos-5.8 - box_url: https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8.box -suites: -- name: package - run_list: - - recipe[nodejs] - attributes: - nodejs: - install_method: package -- name: source - run_list: - - recipe[nodejs] - attributes: - nodejs: - install_method: source diff --git a/vagrant/cookbooks/nodejs/.travis.yml b/vagrant/cookbooks/nodejs/.travis.yml deleted file mode 100755 index dc5e438a..00000000 --- a/vagrant/cookbooks/nodejs/.travis.yml +++ /dev/null @@ -1,6 +0,0 @@ -language: ruby -gemfile: -- test/support/Gemfile -rvm: -- 1.9.3 -script: bundle exec rake foodcritic diff --git a/vagrant/cookbooks/nodejs/Berksfile b/vagrant/cookbooks/nodejs/Berksfile deleted file mode 100755 index 4d8792e2..00000000 --- a/vagrant/cookbooks/nodejs/Berksfile +++ /dev/null @@ -1,3 +0,0 @@ -cookbook 'apt', '~> 1.7.0' -cookbook 'build-essential' -cookbook 'nodejs', :path => '.' diff --git a/vagrant/cookbooks/nodejs/CHANGELOG.md b/vagrant/cookbooks/nodejs/CHANGELOG.md deleted file mode 100755 index c2a6e73a..00000000 --- a/vagrant/cookbooks/nodejs/CHANGELOG.md +++ /dev/null @@ -1,15 +0,0 @@ -## v1.0.2: - * add smartos support for package install - thanks @sax - * support to compile with all processors available (default 2 if unknown) - thanks @ChrisLundquist - * moved to `platform_family` syntax - * ensure npm recipe honours the 'source' or 'package' setting - thanks @markbirbeck - * updated the default versions to the latest stable node/npm - -## v1.0.1: - - * fixed bug that prevented overwritting the node/npm versions (moved the `src_url`s as local variables instead of attributes) - thanks @johannesbecker - * updated the default versions to the latest node/npm - -## v1.0.0: - -* added packages installation support thanks to Nathan L Smith diff --git a/vagrant/cookbooks/nodejs/Gemfile b/vagrant/cookbooks/nodejs/Gemfile deleted file mode 100755 index aab532fc..00000000 --- a/vagrant/cookbooks/nodejs/Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source :rubygems - -gem 'foodcritic' -gem 'berkshelf' -gem 'jamie' -gem 'jamie-vagrant' diff --git a/vagrant/cookbooks/nodejs/README.md b/vagrant/cookbooks/nodejs/README.md deleted file mode 100755 index 9ed5698d..00000000 --- a/vagrant/cookbooks/nodejs/README.md +++ /dev/null @@ -1,71 +0,0 @@ -# nodejs-cookbook [![Build Status](https://secure.travis-ci.org/mdxp/nodejs-cookbook.png)](http://travis-ci.org/mdxp/nodejs-cookbook) - -DESCRIPTION -=========== - -Installs Node.JS - -REQUIREMENTS -============ - - -## Platform - -* Tested on Debian 6 and Ubuntu 10.04 -* Should work fine on Centos, RHEL, etc. - -## Cookbooks: - -* build-essential - -Opscode cookbooks (http://github.com/opscode/cookbooks/tree/master) - -ATTRIBUTES -========== - -* nodejs['install_method'] = source or package -* nodejs['version'] - release version of node to install -* nodejs['src_url'] - download location for node source tarball -* nodejs['dir'] - location where node will be installed, default /usr/local -* nodejs['npm'] - version of npm to install -* nodejs['npm_src_url'] - download location for npm source tarball - -USAGE -===== - -Include the nodejs recipe to install node on your system based on the default installation method: - -* include_recipe "nodejs" - -Include the install_from_source recipe to install node from sources: - -* include_recipe "nodejs::install_from_source" - -Include the install_from_package recipe to install node from packages: - -* include_recipe "nodejs::install_from_package" - -Include the npm recipe to install npm: - -* include_recipe "nodejs::npm" - -LICENSE and AUTHOR -================== - -Author:: Marius Ducea (marius@promethost.com) -Author:: Nathan L Smith (nlloyds@gmail.com) - -Copyright:: 2010-2012, Promet Solutions -Copyright:: 2012, Cramer Development, 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. diff --git a/vagrant/cookbooks/nodejs/Rakefile b/vagrant/cookbooks/nodejs/Rakefile deleted file mode 100755 index 4c357c88..00000000 --- a/vagrant/cookbooks/nodejs/Rakefile +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env rake - -@cookbook = "nodejs" - -desc "Runs foodcritic linter" -task :foodcritic do - if Gem::Version.new("1.9.2") <= Gem::Version.new(RUBY_VERSION.dup) - sandbox = File.join(File.dirname(__FILE__), %w{tmp foodcritic}, @cookbook) - prepare_foodcritic_sandbox(sandbox) - - sh "foodcritic --epic-fail any #{File.dirname(sandbox)}" - else - puts "WARN: foodcritic run is skipped as Ruby #{RUBY_VERSION} is < 1.9.2." - end -end - -task :default => 'foodcritic' - -private - -def prepare_foodcritic_sandbox(sandbox) - files = %w{*.md *.rb attributes definitions files providers -recipes resources templates} - - rm_rf sandbox - mkdir_p sandbox - cp_r Dir.glob("{#{files.join(',')}}"), sandbox - puts "\n\n" -end - -begin - require 'jamie/rake_tasks' - Jamie::RakeTasks.new -rescue LoadError - puts ">>>>> Jamie gem not loaded, omitting tasks" unless ENV['CI'] -end diff --git a/vagrant/cookbooks/nodejs/Vagrantfile b/vagrant/cookbooks/nodejs/Vagrantfile deleted file mode 100755 index 1d30eb1d..00000000 --- a/vagrant/cookbooks/nodejs/Vagrantfile +++ /dev/null @@ -1,9 +0,0 @@ -# Automatically install and mount cookbooks from Berksfile - -require 'berkshelf/vagrant' -require 'jamie/vagrant' - -Vagrant::Config.run do |config| - Jamie::Vagrant.define_vms(config) -end - diff --git a/vagrant/cookbooks/nodejs/attributes/default.rb b/vagrant/cookbooks/nodejs/attributes/default.rb deleted file mode 100755 index 1d6d5df9..00000000 --- a/vagrant/cookbooks/nodejs/attributes/default.rb +++ /dev/null @@ -1,25 +0,0 @@ -# -# Cookbook Name:: nodejs -# Attributes:: nodejs -# -# Copyright 2010-2012, Promet Solutions -# -# 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. -# - -default['nodejs']['install_method'] = 'source' -default['nodejs']['version'] = '0.8.18' -default['nodejs']['checksum'] = '1d63dd42f9bd22f087585ddf80a881c6acbe1664891b1dda3b71306fe9ae00f9' -default['nodejs']['dir'] = '/usr/local' -default['nodejs']['npm'] = '1.2.0' -default['nodejs']['src_url'] = "http://nodejs.org/dist" diff --git a/vagrant/cookbooks/nodejs/metadata.rb b/vagrant/cookbooks/nodejs/metadata.rb deleted file mode 100755 index 0c31ff18..00000000 --- a/vagrant/cookbooks/nodejs/metadata.rb +++ /dev/null @@ -1,20 +0,0 @@ -maintainer "Promet Solutions" -maintainer_email "marius@promethost.com" -license "Apache 2.0" -description "Installs/Configures nodejs" -long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "1.0.3" -name "nodejs" -provides "nodejs" - -recipe "nodejs", "Installs Node.JS based on the default installation method" -recipe "nodejs::install_from_source", "Installs Node.JS from source" -recipe "nodejs::install_from_package", "Installs Node.JS from packages" -recipe "nodejs::npm", "Installs npm from source - a package manager for node" - -depends "build-essential" -depends "apt" - -%w{ debian ubuntu centos redhat smartos }.each do |os| - supports os -end diff --git a/vagrant/cookbooks/nodejs/recipes/default.rb b/vagrant/cookbooks/nodejs/recipes/default.rb deleted file mode 100755 index e469e72b..00000000 --- a/vagrant/cookbooks/nodejs/recipes/default.rb +++ /dev/null @@ -1,25 +0,0 @@ -# -# Author:: Marius Ducea (marius@promethost.com) -# Cookbook Name:: nodejs -# Recipe:: default -# -# Copyright 2010-2012, Promet Solutions -# -# 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_family'] - when "debian" - include_recipe "apt" -end - -include_recipe "nodejs::install_from_#{node['nodejs']['install_method']}" diff --git a/vagrant/cookbooks/nodejs/recipes/install_from_package.rb b/vagrant/cookbooks/nodejs/recipes/install_from_package.rb deleted file mode 100755 index 55e3307a..00000000 --- a/vagrant/cookbooks/nodejs/recipes/install_from_package.rb +++ /dev/null @@ -1,57 +0,0 @@ -# -# Author:: Nathan L Smith (nlloyds@gmail.com) -# Cookbook Name:: nodejs -# Recipe:: package -# -# Copyright 2012, Cramer Development, 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_family'] - when 'rhel', 'fedora' - file = '/usr/local/src/nodejs-stable-release.noarch.rpm' - - remote_file file do - source 'http://nodejs.tchol.org/repocfg/el/nodejs-stable-release.noarch.rpm' - action :create_if_missing - end - - yum_package 'nodejs-stable-release' do - source file - options '--nogpgcheck' - end - - %w{ nodejs nodejs-compat-symlinks npm }.each do |pkg| - package pkg - end - when 'debian' - apt_repository 'node.js' do - uri 'http://ppa.launchpad.net/chris-lea/node.js/ubuntu' - distribution node['lsb']['codename'] - components ['main'] - keyserver "keyserver.ubuntu.com" - key "C7917B12" - action :add - end - - %w{ nodejs npm }.each do |pkg| - package pkg - end - when 'smartos' - %w{ nodejs }.each do |pkg| - package pkg - end - else - include_recipe "nodejs::install_from_source" -end diff --git a/vagrant/cookbooks/nodejs/recipes/install_from_source.rb b/vagrant/cookbooks/nodejs/recipes/install_from_source.rb deleted file mode 100755 index d10ad45c..00000000 --- a/vagrant/cookbooks/nodejs/recipes/install_from_source.rb +++ /dev/null @@ -1,69 +0,0 @@ -# -# Author:: Marius Ducea (marius@promethost.com) -# Cookbook Name:: nodejs -# Recipe:: source -# -# Copyright 2010-2012, Promet Solutions -# -# 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. -# - -include_recipe "build-essential" - -case node['platform_family'] - when 'rhel','fedora' - package "openssl-devel" - when 'debian' - package "libssl-dev" -end - -nodejs_tar = "node-v#{node['nodejs']['version']}.tar.gz" -nodejs_tar_path = nodejs_tar -if node['nodejs']['version'].split('.')[1].to_i >= 5 - nodejs_tar_path = "v#{node['nodejs']['version']}/#{nodejs_tar_path}" -end -# Let the user override the source url in the attributes -nodejs_src_url = "#{node['nodejs']['src_url']}/#{nodejs_tar_path}" - -remote_file "/usr/local/src/#{nodejs_tar}" do - source nodejs_src_url - checksum node['nodejs']['checksum'] - mode 0644 - action :create_if_missing -end - -# --no-same-owner required overcome "Cannot change ownership" bug -# on NFS-mounted filesystem -execute "tar --no-same-owner -zxf #{nodejs_tar}" do - cwd "/usr/local/src" - creates "/usr/local/src/node-v#{node['nodejs']['version']}" -end - -make_threads = node['cpu'] ? node['cpu']['total'].to_i : 2 -bash "compile node.js (on #{make_threads} cpu)" do - # OSX doesn't have the attribute so arbitrarily default 2 - cwd "/usr/local/src/node-v#{node['nodejs']['version']}" - code <<-EOH - PATH="/usr/local/bin:$PATH" - ./configure --prefix=#{node['nodejs']['dir']} && \ - make -j #{make_threads} - EOH - creates "/usr/local/src/node-v#{node['nodejs']['version']}/node" -end - -execute "nodejs make install" do - environment({"PATH" => "/usr/local/bin:/usr/bin:/bin:$PATH"}) - command "make install" - cwd "/usr/local/src/node-v#{node['nodejs']['version']}" - not_if {File.exists?("#{node['nodejs']['dir']}/bin/node") && `#{node['nodejs']['dir']}/bin/node --version`.chomp == "v#{node['nodejs']['version']}" } -end diff --git a/vagrant/cookbooks/nodejs/recipes/npm.rb b/vagrant/cookbooks/nodejs/recipes/npm.rb deleted file mode 100755 index a16f27a1..00000000 --- a/vagrant/cookbooks/nodejs/recipes/npm.rb +++ /dev/null @@ -1,38 +0,0 @@ -# -# Author:: Marius Ducea (marius@promethost.com) -# Cookbook Name:: nodejs -# Recipe:: npm -# -# Copyright 2010-2012, Promet Solutions -# -# 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. -# - -include_recipe "nodejs" - -package "curl" - -npm_src_url = "http://registry.npmjs.org/npm/-/npm-#{node['nodejs']['npm']}.tgz" - -bash "install npm - package manager for node" do - cwd "/usr/local/src" - user "root" - code <<-EOH - mkdir -p npm-v#{node['nodejs']['npm']} && \ - cd npm-v#{node['nodejs']['npm']} - curl -L #{npm_src_url} | tar xzf - --strip-components=1 && \ - make uninstall dev - EOH - not_if "#{node['nodejs']['dir']}/bin/npm -v 2>&1 | grep '#{node['nodejs']['npm']}'" -end - diff --git a/vagrant/cookbooks/npm/README.md b/vagrant/cookbooks/npm/README.md deleted file mode 100644 index 66928b5c..00000000 --- a/vagrant/cookbooks/npm/README.md +++ /dev/null @@ -1,53 +0,0 @@ -# Cookbook for Node Package Manager -http://community.opscode.com/cookbooks/npm - -##DESCRIPTION: -This cookbook grown up from mdxp's nodejs::npm recipe -It provides some LWRP's for simple management of node packages - -##REQUIREMENTS: -This cookbook depends on https://github.com/mdxp/cookbooks/tree/master/nodejs/ - -##ATTRIBUTES: -The only attribute default['npm']['version'] specifies a version of npm should be installed. - -_NOTE:_ this cookbook will not work with npm <= 1.0.0 - -##USAGE: -Use recipe['npm'] to install npm it self. -To install some packge system-wide use - - npm_package "foo@0.3.2" - -or - - npm_package "foo" do - version "0.3.2" - action :install - end - -To install some package under your project root try to: - - npm_package "foo" do - version "0.3.2" - path "/your/project/path/goes/here" - action :install_local - end - -To uninstall some package - obviously you can do something like - - npm_package "bad_one" do - version "0.3.2" - action :uninstall - end - -or - - npm_package "bad_local_one" do - version "0.3.2" - path "/your/project/path/goes/here" - action :uninstall_local - end - -## TODO -- wrap other features of npm to LWRP diff --git a/vagrant/cookbooks/npm/attributes/default.rb b/vagrant/cookbooks/npm/attributes/default.rb deleted file mode 100644 index 259dbc58..00000000 --- a/vagrant/cookbooks/npm/attributes/default.rb +++ /dev/null @@ -1,22 +0,0 @@ -# -# Cookbook Name:: npm -# -# Author:: Sergey Balbeko -# -# Copyright 2012, Sergey Balbeko -# -# 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. -# - -default['npm']['version'] = '1.1.0-3' -#default['npm'][''] = '' \ No newline at end of file diff --git a/vagrant/cookbooks/npm/metadata.json b/vagrant/cookbooks/npm/metadata.json deleted file mode 100644 index a7fe0486..00000000 --- a/vagrant/cookbooks/npm/metadata.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "npm", - "description": "Installs/Configures npm", - "long_description": "# Cookbook for Node Package Manager\nhttp://community.opscode.com/cookbooks/npm\n\n##DESCRIPTION:\nThis cookbook grown up from mdxp's nodejs::npm recipe\nIt provides some LWRP's for simple management of node packages\n\n##REQUIREMENTS:\nThis cookbook depends on https://github.com/mdxp/cookbooks/tree/master/nodejs/\n\n##ATTRIBUTES:\nThe only attribute default['npm']['version'] specifies a version of npm should be installed.\n\n_NOTE:_ this cookbook will not work with npm <= 1.0.0\n\n##USAGE:\nUse recipe['npm'] to install npm it self. \nTo install some packge system-wide use\n\n npm_package \"foo@0.3.2\"\n\nor\n\n npm_package \"foo\" do\n version \"0.3.2\"\n action :install\n end \n\nTo install some package under your project root try to:\n\n npm_package \"foo\" do\n\t version \"0.3.2\"\n\t path \"/your/project/path/goes/here\"\n\t action :install_local\n\tend\n\t\nTo uninstall some package - obviously you can do something like\n\n npm_package \"bad_one\" do\n\t version \"0.3.2\"\n\t action :uninstall\n\tend\n\t\nor\n\n npm_package \"bad_local_one\" do\n\t version \"0.3.2\"\n\t path \"/your/project/path/goes/here\"\n\t action :uninstall_local\n\tend\n\n## TODO\n- wrap other features of npm to LWRP\n", - "maintainer": "Sergey Balbeko", - "maintainer_email": "sergey@balbeko.com", - "license": "Apache License, Version 2.0", - "platforms": { - }, - "dependencies": { - "nodejs": ">= 0.0.0" - }, - "recommendations": { - }, - "suggestions": { - }, - "conflicting": { - }, - "providing": { - }, - "replacing": { - }, - "attributes": { - }, - "groupings": { - }, - "recipes": { - }, - "version": "0.1.1" -} \ No newline at end of file diff --git a/vagrant/cookbooks/npm/metadata.rb b/vagrant/cookbooks/npm/metadata.rb deleted file mode 100644 index 62ffe9c3..00000000 --- a/vagrant/cookbooks/npm/metadata.rb +++ /dev/null @@ -1,28 +0,0 @@ -# -# Cookbook Name:: npm -# -# Author:: Sergey Balbeko -# -# Copyright 2012, Sergey Balbeko -# -# 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. -# - -maintainer "Sergey Balbeko" -maintainer_email "sergey@balbeko.com" -license "Apache License, Version 2.0" -description "Installs/Configures npm" -long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "0.1.1" - -depends "nodejs" diff --git a/vagrant/cookbooks/npm/providers/package.rb b/vagrant/cookbooks/npm/providers/package.rb deleted file mode 100644 index 016c426d..00000000 --- a/vagrant/cookbooks/npm/providers/package.rb +++ /dev/null @@ -1,35 +0,0 @@ -action :install do - cmd = "npm -g install #{new_resource.name}" - cmd += "@#{new_resource.version}" if new_resource.version - execute "install NPM package #{new_resource.name}" do - command cmd - end -end - -action :install_local do - path = new_resource.path if new_resource.path - cmd = "npm install #{new_resource.name}" - cmd += "@#{new_resource.version}" if new_resource.version - execute "install NPM package #{new_resource.name} into #{path}" do - cwd path - command cmd - end -end - -action :uninstall do - cmd = "npm -g uninstall #{new_resource.name}" - cmd += "@#{new_resource.version}" if new_resource.version - execute "uninstall NPM package #{new_resource.name}" do - command cmd - end -end - -action :uninstall_local do - path = new_resource.path if new_resource.path - cmd = "npm uninstall #{new_resource.name}" - cmd += "@#{new_resource.version}" if new_resource.version - execute "uninstall NPM package #{new_resource.name} from #{path}" do - cwd path - command cmd - end -end diff --git a/vagrant/cookbooks/npm/recipes/default.rb b/vagrant/cookbooks/npm/recipes/default.rb deleted file mode 100644 index 989de63e..00000000 --- a/vagrant/cookbooks/npm/recipes/default.rb +++ /dev/null @@ -1,38 +0,0 @@ -# -# Cookbook Name:: npm -# Recipe:: default -# -# Author:: Marius Ducea (marius@promethost.com) -# Author:: Sergey Balbeko -# -# Copyright 2010, Promet Solutions -# Copyright 2012, Sergey Balbeko -# -# 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. -# - -include_recipe "nodejs" - -package "curl" - -bash "install npm - package manager for node" do - cwd "/usr/local/src" - user "root" - code <<-EOF - mkdir -p npm-v#{node[:npm][:version]} && \ - cd npm-v#{node[:npm][:version]} - curl -L http://registry.npmjs.org/npm/-/npm-#{node[:npm][:version]}.tgz | tar xzf - --strip-components=1 && \ - make uninstall dev - EOF - not_if "#{node[:nodejs][:dir]}/bin/npm -v 2>&1 | grep '#{node[:npm][:version]}'" -end \ No newline at end of file diff --git a/vagrant/cookbooks/npm/resources/package.rb b/vagrant/cookbooks/npm/resources/package.rb deleted file mode 100644 index b8a4efcf..00000000 --- a/vagrant/cookbooks/npm/resources/package.rb +++ /dev/null @@ -1,31 +0,0 @@ -# -# Cookbook Name:: npm -# Resource:: npm -# -# Author:: Sergey Balbeko -# -# Copyright 2012, Sergey Balbeko -# -# 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. -# - -actions :install, :install_local, :uninstall, :uninstall_local - -attribute :name, :name_attribute => true -attribute :version, :default => nil -attribute :path, :default => nil - -def initialize(*args) - super - @action = :install -end diff --git a/vagrant/cookbooks/rubygems/metadata.json b/vagrant/cookbooks/rubygems/metadata.json deleted file mode 100644 index 4785dba6..00000000 --- a/vagrant/cookbooks/rubygems/metadata.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "recommendations": { - }, - "attributes": { - }, - "platforms": { - }, - "maintainer": "Opscode, Inc.", - "long_description": "Configures rubygems sources lists\n", - "suggestions": { - }, - "dependencies": { - }, - "recipes": { - "rubygems": "Configures rubygems" - }, - "maintainer_email": "cookbooks@opscode.com", - "version": "0.2.0", - "conflicting": { - }, - "name": "rubygems", - "providing": { - }, - "license": "Apache 2.0", - "replacing": { - }, - "groupings": { - }, - "description": "Opscode rubygems config" - } \ No newline at end of file diff --git a/vagrant/cookbooks/rubygems/metadata.rb b/vagrant/cookbooks/rubygems/metadata.rb deleted file mode 100644 index 0e21b68a..00000000 --- a/vagrant/cookbooks/rubygems/metadata.rb +++ /dev/null @@ -1,9 +0,0 @@ -maintainer "Opscode, Inc." -maintainer_email "cookbooks@opscode.com" -license "Apache 2.0" -description "Opscode rubygems config" -long_description <<-EOH -Configures rubygems sources lists -EOH -version "0.2" -recipe "rubygems", "Configures rubygems" diff --git a/vagrant/cookbooks/rubygems/recipes/default.rb b/vagrant/cookbooks/rubygems/recipes/default.rb deleted file mode 100644 index 21234b1a..00000000 --- a/vagrant/cookbooks/rubygems/recipes/default.rb +++ /dev/null @@ -1,24 +0,0 @@ -# -# Author:: Adam Jacob -# Cookbook Name:: rubygems -# Recipe:: default -# -# Copyright 2009-2010, 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. -# - -execute "gem sources --add http://rubygems.org" do - not_if "gem sources --list | grep 'http://rubygems.org'" -end - diff --git a/vagrant/cookbooks/vagrant_main/recipes/default.rb b/vagrant/cookbooks/vagrant_main/recipes/default.rb deleted file mode 100644 index ab2fc5dd..00000000 --- a/vagrant/cookbooks/vagrant_main/recipes/default.rb +++ /dev/null @@ -1 +0,0 @@ -# empty file \ No newline at end of file diff --git a/vagrant/cookbooks/vagrant_main/recipes/install.rb b/vagrant/cookbooks/vagrant_main/recipes/install.rb deleted file mode 100644 index b7f22f59..00000000 --- a/vagrant/cookbooks/vagrant_main/recipes/install.rb +++ /dev/null @@ -1,53 +0,0 @@ -include_recipe "apt" -include_recipe "apache2" -include_recipe "git" -include_recipe "rubygems" -include_recipe "nodejs" -include_recipe "nodejs::npm" - - - -execute "disable-default-site" do - command "sudo a2dissite default" - notifies :reload, resources(:service => "apache2"), :delayed -end - -web_app "project" do - template "project.conf.erb" - notifies :reload, resources(:service => "apache2"), :delayed -end - -bash "install gem compass" do - user "root" - code <<-EOH - gem install compass - EOH -end - -bash "install npm modules" do - user "root" - code <<-EOH - cd /home/vagrant - npm install fs.extra@1.2.0 - npm install nodewatch@0.3.1 - npm install handlebars@1.0.7 - npm install batchdir@0.1.0 - npm install path@0.4.9 - npm install html@0.0.7 - npm install uglify-js - EOH -end - -bash "Symlink node_modules to root" do - user "root" - code <<-EOH - ln -s /home/vagrant/node_modules/ - EOH -end - -bash "Add cd /project in profile" do - user "vagrant" - code <<-EOH - echo "cd /vagrant" >> /home/vagrant/.profile - EOH -end \ No newline at end of file diff --git a/vagrant/cookbooks/vagrant_main/templates/default/project.conf.erb b/vagrant/cookbooks/vagrant_main/templates/default/project.conf.erb deleted file mode 100644 index a44ddd94..00000000 --- a/vagrant/cookbooks/vagrant_main/templates/default/project.conf.erb +++ /dev/null @@ -1,3 +0,0 @@ - - DocumentRoot <%= @node[:vagrant][:directory] %>/<%= @node[:custom][:vhostdirectory] %> - \ No newline at end of file diff --git a/vagrant/createbox.sh b/vagrant/createbox.sh deleted file mode 100755 index 4a22349a..00000000 --- a/vagrant/createbox.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -#echo "========== create cookbooks.tgz ==========" -#cd cookbooks/ && tar -zcvf ../cookbooks.tgz . && cd .. -#cp cookbooks.tgz ~/Dropbox/Public/vagrant/ -#sleep 1 - - -echo "========== clean directory ==========" -vagrant destroy -vagrant box remove vagrantpackage -rm -rf box -rm .vagrant -rm Vagrantfile - - -echo "========== create box ==========" -cp Vagrantfile_create Vagrantfile -vagrant up -sleep 1 - - - -echo "========== package the box ==========" -#rm Vagrantfile -#cp Vagrantfile_package Vagrantfile -#vagrant package --vagrantfile Vagrantfile -vagrant package --vagrantfile Vagrantfile_package - - -#echo "========== move the box ==========" -mkdir box -mv package.box box -mv box/package.box ~/Dropbox/Public/vagrant - - -#echo "========== clean ==========" -vagrant destroy -vagrant box remove vagrantpackage -rm Vagrantfile -rm .vagrant - - -echo "box created" \ No newline at end of file diff --git a/vagrant/script_start.scpt b/vagrant/script_start.scpt deleted file mode 100644 index f4af441e..00000000 Binary files a/vagrant/script_start.scpt and /dev/null differ diff --git a/vagrant/starttest.sh b/vagrant/starttest.sh deleted file mode 100755 index 4e02bc64..00000000 --- a/vagrant/starttest.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -var="../testvagrant" - -echo "====== start test ======" -cd ${var} -vagrant destroy -vagrant box remove stubbornella -rm -rf ${var} -mkdir ${var} -cp -R ../bootstrap/. ${var} -cd ${var} -rm .vagrant -echo "====== Start VM ======" -vagrant up -echo "====== Access to VM ======" -vagrant ssh -echo "====== End of test ======" \ No newline at end of file