Created
April 14, 2010 04:25
-
-
Save adamhjk/365452 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ### | |
| # Use knife to put the apache2 0.9.1 cookbook in your local repository | |
| ## | |
| [adam@latte](1)% ./knife cookbook site vendor apache2 0.9.1 ~/src/sandbox/opscode/chef/chef/bin | |
| INFO: Downloading apache2 from the cookbooks site at version 0.9.1 | |
| INFO: Cookbook saved: /Users/adam/src/sandbox/opscode/chef-repo/cookbooks/apache2.tar.gz | |
| INFO: Checking out the master branch. | |
| INFO: Checking the status of the vendor branch. | |
| INFO: Creating vendor branch. | |
| INFO: Removing pre-existing version. | |
| INFO: Uncompressing apache2 version 0.9.1. | |
| INFO: Adding changes. | |
| INFO: Committing changes. | |
| INFO: Creating tag chef-vendor-apache2-0.9.1. | |
| INFO: Checking out the master branch. | |
| INFO: Merging changes from apache2 version 0.9.1. | |
| Updating 177f4b7..2dae79e | |
| Fast forward | |
| cookbooks/apache2/README.rdoc | 68 +++ | |
| cookbooks/apache2/attributes/apache.rb | 74 +++ | |
| cookbooks/apache2/definitions/apache_conf.rb | 25 + | |
| cookbooks/apache2/definitions/apache_module.rb | 43 ++ | |
| cookbooks/apache2/definitions/apache_site.rb | 40 ++ | |
| cookbooks/apache2/definitions/web_app.rb | 49 ++ | |
| .../files/default/apache2_module_conf_generate.pl | 41 ++ | |
| cookbooks/apache2/metadata.json | 508 ++++++++++++++++++++ | |
| cookbooks/apache2/metadata.rb | 191 ++++++++ | |
| cookbooks/apache2/recipes/default.rb | 191 ++++++++ | |
| cookbooks/apache2/recipes/god_monitor.rb | 33 ++ | |
| cookbooks/apache2/recipes/mod_alias.rb | 22 + | |
| cookbooks/apache2/recipes/mod_auth_basic.rb | 20 + | |
| cookbooks/apache2/recipes/mod_auth_digest.rb | 20 + | |
| cookbooks/apache2/recipes/mod_authn_file.rb | 20 + | |
| cookbooks/apache2/recipes/mod_authnz_ldap.rb | 20 + | |
| cookbooks/apache2/recipes/mod_authz_default.rb | 20 + | |
| cookbooks/apache2/recipes/mod_authz_groupfile.rb | 20 + | |
| cookbooks/apache2/recipes/mod_authz_host.rb | 20 + | |
| cookbooks/apache2/recipes/mod_authz_user.rb | 20 + | |
| cookbooks/apache2/recipes/mod_autoindex.rb | 22 + | |
| cookbooks/apache2/recipes/mod_cgi.rb | 20 + | |
| cookbooks/apache2/recipes/mod_dav.rb | 20 + | |
| cookbooks/apache2/recipes/mod_dav_svn.rb | 22 + | |
| cookbooks/apache2/recipes/mod_deflate.rb | 22 + | |
| cookbooks/apache2/recipes/mod_dir.rb | 22 + | |
| cookbooks/apache2/recipes/mod_env.rb | 20 + | |
| cookbooks/apache2/recipes/mod_expires.rb | 20 + | |
| cookbooks/apache2/recipes/mod_fcgid.rb | 46 ++ | |
| cookbooks/apache2/recipes/mod_headers.rb | 20 + | |
| cookbooks/apache2/recipes/mod_ldap.rb | 20 + | |
| cookbooks/apache2/recipes/mod_log_config.rb | 24 + | |
| cookbooks/apache2/recipes/mod_mime.rb | 22 + | |
| cookbooks/apache2/recipes/mod_negotiation.rb | 22 + | |
| cookbooks/apache2/recipes/mod_php5.rb | 32 ++ | |
| cookbooks/apache2/recipes/mod_proxy.rb | 22 + | |
| cookbooks/apache2/recipes/mod_proxy_ajp.rb | 20 + | |
| cookbooks/apache2/recipes/mod_proxy_balancer.rb | 20 + | |
| cookbooks/apache2/recipes/mod_proxy_connect.rb | 20 + | |
| cookbooks/apache2/recipes/mod_proxy_http.rb | 20 + | |
| cookbooks/apache2/recipes/mod_python.rb | 22 + | |
| cookbooks/apache2/recipes/mod_rewrite.rb | 20 + | |
| cookbooks/apache2/recipes/mod_setenvif.rb | 22 + | |
| cookbooks/apache2/recipes/mod_ssl.rb | 42 ++ | |
| cookbooks/apache2/recipes/mod_status.rb | 22 + | |
| cookbooks/apache2/templates/default/a2dismod.erb | 22 + | |
| cookbooks/apache2/templates/default/a2dissite.erb | 29 ++ | |
| cookbooks/apache2/templates/default/a2enmod.erb | 37 ++ | |
| cookbooks/apache2/templates/default/a2ensite.erb | 38 ++ | |
| .../apache2/templates/default/apache2.conf.erb | 230 +++++++++ | |
| .../apache2/templates/default/apache2.god.erb | 19 + | |
| cookbooks/apache2/templates/default/charset.erb | 6 + | |
| .../apache2/templates/default/default-site.erb | 57 +++ | |
| cookbooks/apache2/templates/default/mods/README | 2 + | |
| .../apache2/templates/default/mods/alias.conf.erb | 24 + | |
| .../templates/default/mods/autoindex.conf.erb | 101 ++++ | |
| .../templates/default/mods/deflate.conf.erb | 3 + | |
| .../apache2/templates/default/mods/dir.conf.erb | 5 + | |
| .../apache2/templates/default/mods/fcgid.conf.erb | 10 + | |
| .../apache2/templates/default/mods/mime.conf.erb | 191 ++++++++ | |
| .../templates/default/mods/negotiation.conf.erb | 18 + | |
| .../apache2/templates/default/mods/proxy.conf.erb | 19 + | |
| .../templates/default/mods/setenvif.conf.erb | 28 ++ | |
| .../apache2/templates/default/mods/ssl.conf.erb | 72 +++ | |
| .../apache2/templates/default/mods/status.conf.erb | 16 + | |
| .../apache2/templates/default/port_apache.erb | 2 + | |
| cookbooks/apache2/templates/default/ports.conf.erb | 6 + | |
| cookbooks/apache2/templates/default/security.erb | 50 ++ | |
| .../apache2/templates/default/web_app.conf.erb | 43 ++ | |
| 69 files changed, 3057 insertions(+), 0 deletions(-) | |
| create mode 100644 cookbooks/apache2/README.rdoc | |
| create mode 100644 cookbooks/apache2/attributes/apache.rb | |
| create mode 100644 cookbooks/apache2/definitions/apache_conf.rb | |
| create mode 100644 cookbooks/apache2/definitions/apache_module.rb | |
| create mode 100644 cookbooks/apache2/definitions/apache_site.rb | |
| create mode 100644 cookbooks/apache2/definitions/web_app.rb | |
| create mode 100644 cookbooks/apache2/files/default/apache2_module_conf_generate.pl | |
| create mode 100644 cookbooks/apache2/metadata.json | |
| create mode 100644 cookbooks/apache2/metadata.rb | |
| create mode 100644 cookbooks/apache2/recipes/default.rb | |
| create mode 100644 cookbooks/apache2/recipes/god_monitor.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_alias.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_auth_basic.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_auth_digest.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_authn_file.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_authnz_ldap.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_authz_default.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_authz_groupfile.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_authz_host.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_authz_user.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_autoindex.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_cgi.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_dav.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_dav_svn.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_deflate.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_dir.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_env.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_expires.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_fcgid.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_headers.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_ldap.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_log_config.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_mime.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_negotiation.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_php5.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_proxy.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_proxy_ajp.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_proxy_balancer.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_proxy_connect.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_proxy_http.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_python.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_rewrite.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_setenvif.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_ssl.rb | |
| create mode 100644 cookbooks/apache2/recipes/mod_status.rb | |
| create mode 100644 cookbooks/apache2/templates/default/a2dismod.erb | |
| create mode 100644 cookbooks/apache2/templates/default/a2dissite.erb | |
| create mode 100644 cookbooks/apache2/templates/default/a2enmod.erb | |
| create mode 100644 cookbooks/apache2/templates/default/a2ensite.erb | |
| create mode 100644 cookbooks/apache2/templates/default/apache2.conf.erb | |
| create mode 100644 cookbooks/apache2/templates/default/apache2.god.erb | |
| create mode 100644 cookbooks/apache2/templates/default/charset.erb | |
| create mode 100644 cookbooks/apache2/templates/default/default-site.erb | |
| create mode 100644 cookbooks/apache2/templates/default/mods/README | |
| create mode 100644 cookbooks/apache2/templates/default/mods/alias.conf.erb | |
| create mode 100644 cookbooks/apache2/templates/default/mods/autoindex.conf.erb | |
| create mode 100644 cookbooks/apache2/templates/default/mods/deflate.conf.erb | |
| create mode 100644 cookbooks/apache2/templates/default/mods/dir.conf.erb | |
| create mode 100644 cookbooks/apache2/templates/default/mods/fcgid.conf.erb | |
| create mode 100644 cookbooks/apache2/templates/default/mods/mime.conf.erb | |
| create mode 100644 cookbooks/apache2/templates/default/mods/negotiation.conf.erb | |
| create mode 100644 cookbooks/apache2/templates/default/mods/proxy.conf.erb | |
| create mode 100644 cookbooks/apache2/templates/default/mods/setenvif.conf.erb | |
| create mode 100644 cookbooks/apache2/templates/default/mods/ssl.conf.erb | |
| create mode 100644 cookbooks/apache2/templates/default/mods/status.conf.erb | |
| create mode 100644 cookbooks/apache2/templates/default/port_apache.erb | |
| create mode 100644 cookbooks/apache2/templates/default/ports.conf.erb | |
| create mode 100644 cookbooks/apache2/templates/default/security.erb | |
| create mode 100644 cookbooks/apache2/templates/default/web_app.conf.erb | |
| INFO: Cookbook apache2 version 0.9.1 successfully vendored! | |
| ### | |
| # Results in.. | |
| ### | |
| [adam@latte](1)% git branch ~/src/sandbox/opscode/chef-repo | |
| chef-vendor-apache2 | |
| * master | |
| [adam@latte](1)% git log ~/src/sandbox/opscode/chef-repo | |
| commit 2dae79e982ec9d2152502392695e004329dfb489 | |
| Author: Adam Jacob <adam@opscode.com> | |
| Date: Tue Apr 13 21:14:16 2010 -0700 | |
| Import apache2 version 0.9.1 | |
| ### | |
| # Make your changes directly to the cookbook, not in site-cookbooks with a merge! | |
| ### | |
| [adam@latte]% echo "# whee, vendor merge >> cookbooks/apache2/attributes/apache.rb | |
| [adam@latte]% git status ~/src/sandbox/opscode/chef-repo | |
| # On branch master | |
| # Your branch is ahead of 'origin/master' by 1 commit. | |
| # | |
| # Changed but not updated: | |
| # (use "git add <file>..." to update what will be committed) | |
| # (use "git checkout -- <file>..." to discard changes in working directory) | |
| # | |
| # modified: cookbooks/apache2/attributes/apache.rb | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| [adam@latte](1)% git commit -a -m "Adding a wee comment to apache.rb" | |
| [master 2d46ee1] Adding a wee comment to apache.rb | |
| 1 files changed, 1 insertions(+), 0 deletions(-) | |
| ### | |
| # Upgrade to the apache2 0.10.0 release | |
| ### | |
| [adam@latte](1)% ./knife cookbook site vendor apache2 0.10.0 ~/src/sandbox/opscode/chef/chef/bin | |
| INFO: Downloading apache2 from the cookbooks site at version 0.10.0 | |
| INFO: Cookbook saved: /Users/adam/src/sandbox/opscode/chef-repo/cookbooks/apache2.tar.gz | |
| INFO: Checking out the master branch. | |
| INFO: Checking the status of the vendor branch. | |
| INFO: Vendor branch found. | |
| INFO: Removing pre-existing version. | |
| INFO: Uncompressing apache2 version 0.10.0. | |
| INFO: Adding changes. | |
| INFO: Committing changes. | |
| INFO: Creating tag chef-vendor-apache2-0.10.0. | |
| INFO: Checking out the master branch. | |
| INFO: Merging changes from apache2 version 0.10.0. | |
| Auto-merging cookbooks/apache2/attributes/apache.rb # <<<<!!! Changes preserved !!!>>> | |
| Merge made by recursive. | |
| cookbooks/apache2/README.rdoc | 10 + | |
| cookbooks/apache2/attributes/apache.rb | 3 + | |
| cookbooks/apache2/metadata.json | 969 ++++++++++---------- | |
| cookbooks/apache2/metadata.rb | 8 +- | |
| cookbooks/apache2/recipes/mod_auth_openid.rb | 59 ++ | |
| .../templates/default/mod_auth_openid.rb.erb | 12 + | |
| .../templates/default/mods/authopenid.load.erb | 1 + | |
| .../templates/default/mods/deflate.conf.erb | 15 +- | |
| 8 files changed, 585 insertions(+), 492 deletions(-) | |
| create mode 100644 cookbooks/apache2/recipes/mod_auth_openid.rb | |
| create mode 100644 cookbooks/apache2/templates/default/mod_auth_openid.rb.erb | |
| create mode 100644 cookbooks/apache2/templates/default/mods/authopenid.load.erb | |
| INFO: Cookbook apache2 version 0.10.0 successfully vendored! | |
| ### | |
| # Leave off the version number to go to the latest.. | |
| ### | |
| [adam@latte](1)% ./knife cookbook site vendor apache2 ~/src/sandbox/opscode/chef/chef/bin | |
| INFO: Downloading apache2 from the cookbooks site at version 0.10.1 | |
| INFO: Cookbook saved: /Users/adam/src/sandbox/opscode/chef-repo/cookbooks/apache2.tar.gz | |
| INFO: Checking out the master branch. | |
| INFO: Checking the status of the vendor branch. | |
| INFO: Vendor branch found. | |
| INFO: Removing pre-existing version. | |
| INFO: Uncompressing apache2 version 0.10.1. | |
| INFO: Adding changes. | |
| INFO: Committing changes. | |
| INFO: Creating tag chef-vendor-apache2-0.10.1. | |
| INFO: Checking out the master branch. | |
| INFO: Merging changes from apache2 version 0.10.1. | |
| Merge made by recursive. | |
| cookbooks/apache2/metadata.json | 240 ++++++++++---------- | |
| cookbooks/apache2/metadata.rb | 2 +- | |
| .../templates/default/mod_auth_openid.rb.erb | 2 +- | |
| 3 files changed, 122 insertions(+), 122 deletions(-) | |
| INFO: Cookbook apache2 version 0.10.1 successfully vendored! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment