v1.9.6

vccw-team · Dec 12, 2014 · 6d5e69f · 6d5e69f
1 parent 3d1d78f
commit 6d5e69f
Show file tree

Hide file tree

Showing 339 changed files with 8 additions and 269 deletions.
diff --git a/.gitattribute b/.gitattribute
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 .vagrant
 www
-Vagrantfile
 Movefile
 _site
 .DS_Store
@@ -9,3 +8,9 @@ provision/*
 !provision/.gitkeep
 !provision/packaging.sh
 package.box
+.gitattribute
+Gemfile
+Gemfile.lock
+Rakefile
+spec
+provision/packaging.sh
diff --git a/Gemfile b/Gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/Rakefile b/Rakefile
diff --git a/Vagrantfile.sample → Vagrantfile b/Vagrantfile.sample → Vagrantfile
@@ -48,7 +48,7 @@ WP_THEME_UNIT_TEST   = false # automatic import theme unit test data
 
 WP_ALWAYS_RESET      = true # always reset database
 
-WP_CHEF_COOKBOOKS_PATH = File.dirname(__FILE__) # path to the cookbooks (e.g. ~/vccw)
+WP_CHEF_COOKBOOKS_PATH = File.join(File.dirname(__FILE__), 'chef') # path to the cookbooks (e.g. ~/vccw)
 
 if WP_LANG === 'ja' then
   WP_THEME_UNIT_TEST_DATA_URI = 'https://raw.githubusercontent.com/jawordpressorg/theme-test-data-ja/master/wordpress-theme-test-date-ja.xml'

diff --git a/cookbooks/.gitkeep → chef/cookbooks/.gitkeep b/cookbooks/.gitkeep → chef/cookbooks/.gitkeep
diff --git a/cookbooks/apache2/.gitignore → chef/cookbooks/apache2/.gitignore b/cookbooks/apache2/.gitignore → chef/cookbooks/apache2/.gitignore
diff --git a/cookbooks/apache2/CHANGELOG.md → chef/cookbooks/apache2/CHANGELOG.md b/cookbooks/apache2/CHANGELOG.md → chef/cookbooks/apache2/CHANGELOG.md
diff --git a/cookbooks/apache2/CONTRIBUTING.md → chef/cookbooks/apache2/CONTRIBUTING.md b/cookbooks/apache2/CONTRIBUTING.md → chef/cookbooks/apache2/CONTRIBUTING.md
diff --git a/cookbooks/apache2/Gemfile → chef/cookbooks/apache2/Gemfile b/cookbooks/apache2/Gemfile → chef/cookbooks/apache2/Gemfile
diff --git a/cookbooks/apache2/LICENSE → chef/cookbooks/apache2/LICENSE b/cookbooks/apache2/LICENSE → chef/cookbooks/apache2/LICENSE
diff --git a/cookbooks/apache2/README.md → chef/cookbooks/apache2/README.md b/cookbooks/apache2/README.md → chef/cookbooks/apache2/README.md
diff --git a/cookbooks/apache2/attributes/default.rb → chef/cookbooks/apache2/attributes/default.rb b/cookbooks/apache2/attributes/default.rb → chef/cookbooks/apache2/attributes/default.rb
diff --git a/cookbooks/apache2/attributes/mod_auth_cas.rb → ...kbooks/apache2/attributes/mod_auth_cas.rb b/cookbooks/apache2/attributes/mod_auth_cas.rb → ...kbooks/apache2/attributes/mod_auth_cas.rb
diff --git a/...oks/apache2/attributes/mod_auth_openid.rb → ...oks/apache2/attributes/mod_auth_openid.rb b/...oks/apache2/attributes/mod_auth_openid.rb → ...oks/apache2/attributes/mod_auth_openid.rb
diff --git a/cookbooks/apache2/attributes/mod_ssl.rb → chef/cookbooks/apache2/attributes/mod_ssl.rb b/cookbooks/apache2/attributes/mod_ssl.rb → chef/cookbooks/apache2/attributes/mod_ssl.rb
diff --git a/cookbooks/apache2/definitions/apache_conf.rb → ...kbooks/apache2/definitions/apache_conf.rb b/cookbooks/apache2/definitions/apache_conf.rb → ...kbooks/apache2/definitions/apache_conf.rb
diff --git a/...ooks/apache2/definitions/apache_module.rb → ...ooks/apache2/definitions/apache_module.rb b/...ooks/apache2/definitions/apache_module.rb → ...ooks/apache2/definitions/apache_module.rb
diff --git a/cookbooks/apache2/definitions/apache_site.rb → ...kbooks/apache2/definitions/apache_site.rb b/cookbooks/apache2/definitions/apache_site.rb → ...kbooks/apache2/definitions/apache_site.rb
diff --git a/cookbooks/apache2/definitions/web_app.rb → .../cookbooks/apache2/definitions/web_app.rb b/cookbooks/apache2/definitions/web_app.rb → .../cookbooks/apache2/definitions/web_app.rb
diff --git a/...s/default/apache2_module_conf_generate.pl → ...s/default/apache2_module_conf_generate.pl b/...s/default/apache2_module_conf_generate.pl → ...s/default/apache2_module_conf_generate.pl
diff --git a/...es/default/tests/minitest/default_test.rb → ...es/default/tests/minitest/default_test.rb b/...es/default/tests/minitest/default_test.rb → ...es/default/tests/minitest/default_test.rb
diff --git a/...efault/tests/minitest/god_monitor_test.rb → ...efault/tests/minitest/god_monitor_test.rb b/...efault/tests/minitest/god_monitor_test.rb → ...efault/tests/minitest/god_monitor_test.rb
diff --git a/...default/tests/minitest/mod_apreq2_test.rb → ...default/tests/minitest/mod_apreq2_test.rb b/...default/tests/minitest/mod_apreq2_test.rb → ...default/tests/minitest/mod_apreq2_test.rb
diff --git a/...fault/tests/minitest/mod_auth_cas_test.rb → ...fault/tests/minitest/mod_auth_cas_test.rb b/...fault/tests/minitest/mod_auth_cas_test.rb → ...fault/tests/minitest/mod_auth_cas_test.rb
diff --git a/...lt/tests/minitest/mod_auth_openid_test.rb → ...lt/tests/minitest/mod_auth_openid_test.rb b/...lt/tests/minitest/mod_auth_openid_test.rb → ...lt/tests/minitest/mod_auth_openid_test.rb
diff --git a/...es/default/tests/minitest/mod_cgi_test.rb → ...es/default/tests/minitest/mod_cgi_test.rb b/...es/default/tests/minitest/mod_cgi_test.rb → ...es/default/tests/minitest/mod_cgi_test.rb
diff --git a/...efault/tests/minitest/mod_dav_svn_test.rb → ...efault/tests/minitest/mod_dav_svn_test.rb b/...efault/tests/minitest/mod_dav_svn_test.rb → ...efault/tests/minitest/mod_dav_svn_test.rb
diff --git a/...les/default/tests/minitest/mod_fastcgi.rb → ...les/default/tests/minitest/mod_fastcgi.rb b/...les/default/tests/minitest/mod_fastcgi.rb → ...les/default/tests/minitest/mod_fastcgi.rb
diff --git a/...efault/tests/minitest/mod_include_test.rb → ...efault/tests/minitest/mod_include_test.rb b/...efault/tests/minitest/mod_include_test.rb → ...efault/tests/minitest/mod_include_test.rb
diff --git a/...s/default/tests/minitest/mod_perl_test.rb → ...s/default/tests/minitest/mod_perl_test.rb b/...s/default/tests/minitest/mod_perl_test.rb → ...s/default/tests/minitest/mod_perl_test.rb
diff --git a/...s/default/tests/minitest/mod_php5_test.rb → ...s/default/tests/minitest/mod_php5_test.rb b/...s/default/tests/minitest/mod_php5_test.rb → ...s/default/tests/minitest/mod_php5_test.rb
diff --git a/...default/tests/minitest/mod_python_test.rb → ...default/tests/minitest/mod_python_test.rb b/...default/tests/minitest/mod_python_test.rb → ...default/tests/minitest/mod_python_test.rb
diff --git a/...es/default/tests/minitest/mod_ssl_test.rb → ...es/default/tests/minitest/mod_ssl_test.rb b/...es/default/tests/minitest/mod_ssl_test.rb → ...es/default/tests/minitest/mod_ssl_test.rb
diff --git a/...default/tests/minitest/support/helpers.rb → ...default/tests/minitest/support/helpers.rb b/...default/tests/minitest/support/helpers.rb → ...default/tests/minitest/support/helpers.rb
diff --git a/cookbooks/apache2/metadata.json → chef/cookbooks/apache2/metadata.json b/cookbooks/apache2/metadata.json → chef/cookbooks/apache2/metadata.json
diff --git a/cookbooks/apache2/metadata.rb → chef/cookbooks/apache2/metadata.rb b/cookbooks/apache2/metadata.rb → chef/cookbooks/apache2/metadata.rb
diff --git a/cookbooks/apache2/recipes/default.rb → chef/cookbooks/apache2/recipes/default.rb b/cookbooks/apache2/recipes/default.rb → chef/cookbooks/apache2/recipes/default.rb
diff --git a/cookbooks/apache2/recipes/god_monitor.rb → .../cookbooks/apache2/recipes/god_monitor.rb b/cookbooks/apache2/recipes/god_monitor.rb → .../cookbooks/apache2/recipes/god_monitor.rb
diff --git a/cookbooks/apache2/recipes/iptables.rb → chef/cookbooks/apache2/recipes/iptables.rb b/cookbooks/apache2/recipes/iptables.rb → chef/cookbooks/apache2/recipes/iptables.rb
diff --git a/cookbooks/apache2/recipes/logrotate.rb → chef/cookbooks/apache2/recipes/logrotate.rb b/cookbooks/apache2/recipes/logrotate.rb → chef/cookbooks/apache2/recipes/logrotate.rb
diff --git a/cookbooks/apache2/recipes/mod_actions.rb → .../cookbooks/apache2/recipes/mod_actions.rb b/cookbooks/apache2/recipes/mod_actions.rb → .../cookbooks/apache2/recipes/mod_actions.rb
diff --git a/cookbooks/apache2/recipes/mod_alias.rb → chef/cookbooks/apache2/recipes/mod_alias.rb b/cookbooks/apache2/recipes/mod_alias.rb → chef/cookbooks/apache2/recipes/mod_alias.rb
diff --git a/cookbooks/apache2/recipes/mod_apreq2.rb → chef/cookbooks/apache2/recipes/mod_apreq2.rb b/cookbooks/apache2/recipes/mod_apreq2.rb → chef/cookbooks/apache2/recipes/mod_apreq2.rb
diff --git a/cookbooks/apache2/recipes/mod_auth_basic.rb → ...okbooks/apache2/recipes/mod_auth_basic.rb b/cookbooks/apache2/recipes/mod_auth_basic.rb → ...okbooks/apache2/recipes/mod_auth_basic.rb
diff --git a/cookbooks/apache2/recipes/mod_auth_cas.rb → ...cookbooks/apache2/recipes/mod_auth_cas.rb b/cookbooks/apache2/recipes/mod_auth_cas.rb → ...cookbooks/apache2/recipes/mod_auth_cas.rb
diff --git a/cookbooks/apache2/recipes/mod_auth_digest.rb → ...kbooks/apache2/recipes/mod_auth_digest.rb b/cookbooks/apache2/recipes/mod_auth_digest.rb → ...kbooks/apache2/recipes/mod_auth_digest.rb
diff --git a/cookbooks/apache2/recipes/mod_auth_openid.rb → ...kbooks/apache2/recipes/mod_auth_openid.rb b/cookbooks/apache2/recipes/mod_auth_openid.rb → ...kbooks/apache2/recipes/mod_auth_openid.rb
diff --git a/cookbooks/apache2/recipes/mod_authn_file.rb → ...okbooks/apache2/recipes/mod_authn_file.rb b/cookbooks/apache2/recipes/mod_authn_file.rb → ...okbooks/apache2/recipes/mod_authn_file.rb
diff --git a/cookbooks/apache2/recipes/mod_authnz_ldap.rb → ...kbooks/apache2/recipes/mod_authnz_ldap.rb b/cookbooks/apache2/recipes/mod_authnz_ldap.rb → ...kbooks/apache2/recipes/mod_authnz_ldap.rb
diff --git a/...ooks/apache2/recipes/mod_authz_default.rb → ...ooks/apache2/recipes/mod_authz_default.rb b/...ooks/apache2/recipes/mod_authz_default.rb → ...ooks/apache2/recipes/mod_authz_default.rb
diff --git a/...ks/apache2/recipes/mod_authz_groupfile.rb → ...ks/apache2/recipes/mod_authz_groupfile.rb b/...ks/apache2/recipes/mod_authz_groupfile.rb → ...ks/apache2/recipes/mod_authz_groupfile.rb
diff --git a/cookbooks/apache2/recipes/mod_authz_host.rb → ...okbooks/apache2/recipes/mod_authz_host.rb b/cookbooks/apache2/recipes/mod_authz_host.rb → ...okbooks/apache2/recipes/mod_authz_host.rb
diff --git a/cookbooks/apache2/recipes/mod_authz_user.rb → ...okbooks/apache2/recipes/mod_authz_user.rb b/cookbooks/apache2/recipes/mod_authz_user.rb → ...okbooks/apache2/recipes/mod_authz_user.rb
diff --git a/cookbooks/apache2/recipes/mod_autoindex.rb → ...ookbooks/apache2/recipes/mod_autoindex.rb b/cookbooks/apache2/recipes/mod_autoindex.rb → ...ookbooks/apache2/recipes/mod_autoindex.rb
diff --git a/cookbooks/apache2/recipes/mod_cgi.rb → chef/cookbooks/apache2/recipes/mod_cgi.rb b/cookbooks/apache2/recipes/mod_cgi.rb → chef/cookbooks/apache2/recipes/mod_cgi.rb
diff --git a/cookbooks/apache2/recipes/mod_dav.rb → chef/cookbooks/apache2/recipes/mod_dav.rb b/cookbooks/apache2/recipes/mod_dav.rb → chef/cookbooks/apache2/recipes/mod_dav.rb
diff --git a/cookbooks/apache2/recipes/mod_dav_fs.rb → chef/cookbooks/apache2/recipes/mod_dav_fs.rb b/cookbooks/apache2/recipes/mod_dav_fs.rb → chef/cookbooks/apache2/recipes/mod_dav_fs.rb
diff --git a/cookbooks/apache2/recipes/mod_dav_svn.rb → .../cookbooks/apache2/recipes/mod_dav_svn.rb b/cookbooks/apache2/recipes/mod_dav_svn.rb → .../cookbooks/apache2/recipes/mod_dav_svn.rb
diff --git a/cookbooks/apache2/recipes/mod_deflate.rb → .../cookbooks/apache2/recipes/mod_deflate.rb b/cookbooks/apache2/recipes/mod_deflate.rb → .../cookbooks/apache2/recipes/mod_deflate.rb
diff --git a/cookbooks/apache2/recipes/mod_dir.rb → chef/cookbooks/apache2/recipes/mod_dir.rb b/cookbooks/apache2/recipes/mod_dir.rb → chef/cookbooks/apache2/recipes/mod_dir.rb
diff --git a/cookbooks/apache2/recipes/mod_env.rb → chef/cookbooks/apache2/recipes/mod_env.rb b/cookbooks/apache2/recipes/mod_env.rb → chef/cookbooks/apache2/recipes/mod_env.rb
diff --git a/cookbooks/apache2/recipes/mod_expires.rb → .../cookbooks/apache2/recipes/mod_expires.rb b/cookbooks/apache2/recipes/mod_expires.rb → .../cookbooks/apache2/recipes/mod_expires.rb
diff --git a/cookbooks/apache2/recipes/mod_fastcgi.rb → .../cookbooks/apache2/recipes/mod_fastcgi.rb b/cookbooks/apache2/recipes/mod_fastcgi.rb → .../cookbooks/apache2/recipes/mod_fastcgi.rb
diff --git a/cookbooks/apache2/recipes/mod_fcgid.rb → chef/cookbooks/apache2/recipes/mod_fcgid.rb b/cookbooks/apache2/recipes/mod_fcgid.rb → chef/cookbooks/apache2/recipes/mod_fcgid.rb
diff --git a/cookbooks/apache2/recipes/mod_filter.rb → chef/cookbooks/apache2/recipes/mod_filter.rb b/cookbooks/apache2/recipes/mod_filter.rb → chef/cookbooks/apache2/recipes/mod_filter.rb
diff --git a/cookbooks/apache2/recipes/mod_headers.rb → .../cookbooks/apache2/recipes/mod_headers.rb b/cookbooks/apache2/recipes/mod_headers.rb → .../cookbooks/apache2/recipes/mod_headers.rb
diff --git a/cookbooks/apache2/recipes/mod_include.rb → .../cookbooks/apache2/recipes/mod_include.rb b/cookbooks/apache2/recipes/mod_include.rb → .../cookbooks/apache2/recipes/mod_include.rb
diff --git a/cookbooks/apache2/recipes/mod_ldap.rb → chef/cookbooks/apache2/recipes/mod_ldap.rb b/cookbooks/apache2/recipes/mod_ldap.rb → chef/cookbooks/apache2/recipes/mod_ldap.rb
diff --git a/cookbooks/apache2/recipes/mod_log_config.rb → ...okbooks/apache2/recipes/mod_log_config.rb b/cookbooks/apache2/recipes/mod_log_config.rb → ...okbooks/apache2/recipes/mod_log_config.rb
diff --git a/cookbooks/apache2/recipes/mod_logio.rb → chef/cookbooks/apache2/recipes/mod_logio.rb b/cookbooks/apache2/recipes/mod_logio.rb → chef/cookbooks/apache2/recipes/mod_logio.rb
diff --git a/cookbooks/apache2/recipes/mod_mime.rb → chef/cookbooks/apache2/recipes/mod_mime.rb b/cookbooks/apache2/recipes/mod_mime.rb → chef/cookbooks/apache2/recipes/mod_mime.rb
diff --git a/cookbooks/apache2/recipes/mod_negotiation.rb → ...kbooks/apache2/recipes/mod_negotiation.rb b/cookbooks/apache2/recipes/mod_negotiation.rb → ...kbooks/apache2/recipes/mod_negotiation.rb
diff --git a/cookbooks/apache2/recipes/mod_perl.rb → chef/cookbooks/apache2/recipes/mod_perl.rb b/cookbooks/apache2/recipes/mod_perl.rb → chef/cookbooks/apache2/recipes/mod_perl.rb
diff --git a/cookbooks/apache2/recipes/mod_php5.rb → chef/cookbooks/apache2/recipes/mod_php5.rb b/cookbooks/apache2/recipes/mod_php5.rb → chef/cookbooks/apache2/recipes/mod_php5.rb
diff --git a/cookbooks/apache2/recipes/mod_proxy.rb → chef/cookbooks/apache2/recipes/mod_proxy.rb b/cookbooks/apache2/recipes/mod_proxy.rb → chef/cookbooks/apache2/recipes/mod_proxy.rb
diff --git a/cookbooks/apache2/recipes/mod_proxy_ajp.rb → ...ookbooks/apache2/recipes/mod_proxy_ajp.rb b/cookbooks/apache2/recipes/mod_proxy_ajp.rb → ...ookbooks/apache2/recipes/mod_proxy_ajp.rb
diff --git a/...oks/apache2/recipes/mod_proxy_balancer.rb → ...oks/apache2/recipes/mod_proxy_balancer.rb b/...oks/apache2/recipes/mod_proxy_balancer.rb → ...oks/apache2/recipes/mod_proxy_balancer.rb
diff --git a/...ooks/apache2/recipes/mod_proxy_connect.rb → ...ooks/apache2/recipes/mod_proxy_connect.rb b/...ooks/apache2/recipes/mod_proxy_connect.rb → ...ooks/apache2/recipes/mod_proxy_connect.rb
diff --git a/cookbooks/apache2/recipes/mod_proxy_http.rb → ...okbooks/apache2/recipes/mod_proxy_http.rb b/cookbooks/apache2/recipes/mod_proxy_http.rb → ...okbooks/apache2/recipes/mod_proxy_http.rb
diff --git a/cookbooks/apache2/recipes/mod_python.rb → chef/cookbooks/apache2/recipes/mod_python.rb b/cookbooks/apache2/recipes/mod_python.rb → chef/cookbooks/apache2/recipes/mod_python.rb
diff --git a/cookbooks/apache2/recipes/mod_rewrite.rb → .../cookbooks/apache2/recipes/mod_rewrite.rb b/cookbooks/apache2/recipes/mod_rewrite.rb → .../cookbooks/apache2/recipes/mod_rewrite.rb
diff --git a/cookbooks/apache2/recipes/mod_setenvif.rb → ...cookbooks/apache2/recipes/mod_setenvif.rb b/cookbooks/apache2/recipes/mod_setenvif.rb → ...cookbooks/apache2/recipes/mod_setenvif.rb
diff --git a/cookbooks/apache2/recipes/mod_ssl.rb → chef/cookbooks/apache2/recipes/mod_ssl.rb b/cookbooks/apache2/recipes/mod_ssl.rb → chef/cookbooks/apache2/recipes/mod_ssl.rb
diff --git a/cookbooks/apache2/recipes/mod_status.rb → chef/cookbooks/apache2/recipes/mod_status.rb b/cookbooks/apache2/recipes/mod_status.rb → chef/cookbooks/apache2/recipes/mod_status.rb
diff --git a/cookbooks/apache2/recipes/mod_wsgi.rb → chef/cookbooks/apache2/recipes/mod_wsgi.rb b/cookbooks/apache2/recipes/mod_wsgi.rb → chef/cookbooks/apache2/recipes/mod_wsgi.rb
diff --git a/cookbooks/apache2/recipes/mod_xsendfile.rb → ...ookbooks/apache2/recipes/mod_xsendfile.rb b/cookbooks/apache2/recipes/mod_xsendfile.rb → ...ookbooks/apache2/recipes/mod_xsendfile.rb
diff --git a/...ks/apache2/templates/default/a2dismod.erb → ...ks/apache2/templates/default/a2dismod.erb b/...ks/apache2/templates/default/a2dismod.erb → ...ks/apache2/templates/default/a2dismod.erb
diff --git a/...s/apache2/templates/default/a2dissite.erb → ...s/apache2/templates/default/a2dissite.erb b/...s/apache2/templates/default/a2dissite.erb → ...s/apache2/templates/default/a2dissite.erb
diff --git a/...oks/apache2/templates/default/a2enmod.erb → ...oks/apache2/templates/default/a2enmod.erb b/...oks/apache2/templates/default/a2enmod.erb → ...oks/apache2/templates/default/a2enmod.erb
diff --git a/...ks/apache2/templates/default/a2ensite.erb → ...ks/apache2/templates/default/a2ensite.erb b/...ks/apache2/templates/default/a2ensite.erb → ...ks/apache2/templates/default/a2ensite.erb
diff --git a/...pache2/templates/default/apache2.conf.erb → ...pache2/templates/default/apache2.conf.erb b/...pache2/templates/default/apache2.conf.erb → ...pache2/templates/default/apache2.conf.erb
diff --git a/...apache2/templates/default/apache2.god.erb → ...apache2/templates/default/apache2.god.erb b/...apache2/templates/default/apache2.god.erb → ...apache2/templates/default/apache2.god.erb
diff --git a/...oks/apache2/templates/default/charset.erb → ...oks/apache2/templates/default/charset.erb b/...oks/apache2/templates/default/charset.erb → ...oks/apache2/templates/default/charset.erb
diff --git a/...pache2/templates/default/default-site.erb → ...pache2/templates/default/default-site.erb b/...pache2/templates/default/default-site.erb → ...pache2/templates/default/default-site.erb
diff --git a/...templates/default/etc-sysconfig-httpd.erb → ...templates/default/etc-sysconfig-httpd.erb b/...templates/default/etc-sysconfig-httpd.erb → ...templates/default/etc-sysconfig-httpd.erb
diff --git a/...oks/apache2/templates/default/mods/README → ...oks/apache2/templates/default/mods/README b/...oks/apache2/templates/default/mods/README → ...oks/apache2/templates/default/mods/README
diff --git a/...he2/templates/default/mods/alias.conf.erb → ...he2/templates/default/mods/alias.conf.erb b/...he2/templates/default/mods/alias.conf.erb → ...he2/templates/default/mods/alias.conf.erb
diff --git a/.../templates/default/mods/auth_cas.conf.erb → .../templates/default/mods/auth_cas.conf.erb b/.../templates/default/mods/auth_cas.conf.erb → .../templates/default/mods/auth_cas.conf.erb
diff --git a/.../templates/default/mods/auth_cas.load.erb → .../templates/default/mods/auth_cas.load.erb b/.../templates/default/mods/auth_cas.load.erb → .../templates/default/mods/auth_cas.load.erb
diff --git a/...emplates/default/mods/authopenid.load.erb → ...emplates/default/mods/authopenid.load.erb b/...emplates/default/mods/authopenid.load.erb → ...emplates/default/mods/authopenid.load.erb
diff --git a/...templates/default/mods/autoindex.conf.erb → ...templates/default/mods/autoindex.conf.erb b/...templates/default/mods/autoindex.conf.erb → ...templates/default/mods/autoindex.conf.erb
diff --git a/...2/templates/default/mods/deflate.conf.erb → ...2/templates/default/mods/deflate.conf.erb b/...2/templates/default/mods/deflate.conf.erb → ...2/templates/default/mods/deflate.conf.erb
diff --git a/...ache2/templates/default/mods/dir.conf.erb → ...ache2/templates/default/mods/dir.conf.erb b/...ache2/templates/default/mods/dir.conf.erb → ...ache2/templates/default/mods/dir.conf.erb
diff --git a/...2/templates/default/mods/fastcgi.conf.erb → ...2/templates/default/mods/fastcgi.conf.erb b/...2/templates/default/mods/fastcgi.conf.erb → ...2/templates/default/mods/fastcgi.conf.erb
diff --git a/...he2/templates/default/mods/fcgid.conf.erb → ...he2/templates/default/mods/fcgid.conf.erb b/...he2/templates/default/mods/fcgid.conf.erb → ...he2/templates/default/mods/fcgid.conf.erb
diff --git a/...2/templates/default/mods/include.conf.erb → ...2/templates/default/mods/include.conf.erb b/...2/templates/default/mods/include.conf.erb → ...2/templates/default/mods/include.conf.erb
diff --git a/...pache2/templates/default/mods/include.erb → ...pache2/templates/default/mods/include.erb b/...pache2/templates/default/mods/include.erb → ...pache2/templates/default/mods/include.erb
diff --git a/...che2/templates/default/mods/mime.conf.erb → ...che2/templates/default/mods/mime.conf.erb b/...che2/templates/default/mods/mime.conf.erb → ...che2/templates/default/mods/mime.conf.erb
diff --git a/...mplates/default/mods/negotiation.conf.erb → ...mplates/default/mods/negotiation.conf.erb b/...mplates/default/mods/negotiation.conf.erb → ...mplates/default/mods/negotiation.conf.erb
diff --git a/...che2/templates/default/mods/php5.conf.erb → ...che2/templates/default/mods/php5.conf.erb b/...che2/templates/default/mods/php5.conf.erb → ...che2/templates/default/mods/php5.conf.erb
diff --git a/...he2/templates/default/mods/proxy.conf.erb → ...he2/templates/default/mods/proxy.conf.erb b/...he2/templates/default/mods/proxy.conf.erb → ...he2/templates/default/mods/proxy.conf.erb
diff --git a/.../templates/default/mods/setenvif.conf.erb → .../templates/default/mods/setenvif.conf.erb b/.../templates/default/mods/setenvif.conf.erb → .../templates/default/mods/setenvif.conf.erb
diff --git a/...ache2/templates/default/mods/ssl.conf.erb → ...ache2/templates/default/mods/ssl.conf.erb b/...ache2/templates/default/mods/ssl.conf.erb → ...ache2/templates/default/mods/ssl.conf.erb
diff --git a/...e2/templates/default/mods/status.conf.erb → ...e2/templates/default/mods/status.conf.erb b/...e2/templates/default/mods/status.conf.erb → ...e2/templates/default/mods/status.conf.erb
diff --git a/...apache2/templates/default/port_apache.erb → ...apache2/templates/default/port_apache.erb b/...apache2/templates/default/port_apache.erb → ...apache2/templates/default/port_apache.erb
diff --git a/.../apache2/templates/default/ports.conf.erb → .../apache2/templates/default/ports.conf.erb b/.../apache2/templates/default/ports.conf.erb → .../apache2/templates/default/ports.conf.erb
diff --git a/...ks/apache2/templates/default/security.erb → ...ks/apache2/templates/default/security.erb b/...ks/apache2/templates/default/security.erb → ...ks/apache2/templates/default/security.erb
diff --git a/...pache2/templates/default/web_app.conf.erb → ...pache2/templates/default/web_app.conf.erb b/...pache2/templates/default/web_app.conf.erb → ...pache2/templates/default/web_app.conf.erb
diff --git a/cookbooks/build-essential/CHANGELOG.md → chef/cookbooks/build-essential/CHANGELOG.md b/cookbooks/build-essential/CHANGELOG.md → chef/cookbooks/build-essential/CHANGELOG.md
diff --git a/cookbooks/build-essential/README.md → chef/cookbooks/build-essential/README.md b/cookbooks/build-essential/README.md → chef/cookbooks/build-essential/README.md
diff --git a/...oks/build-essential/attributes/default.rb → ...oks/build-essential/attributes/default.rb b/...oks/build-essential/attributes/default.rb → ...oks/build-essential/attributes/default.rb
diff --git a/cookbooks/build-essential/metadata.json → chef/cookbooks/build-essential/metadata.json b/cookbooks/build-essential/metadata.json → chef/cookbooks/build-essential/metadata.json
diff --git a/cookbooks/build-essential/metadata.rb → chef/cookbooks/build-essential/metadata.rb b/cookbooks/build-essential/metadata.rb → chef/cookbooks/build-essential/metadata.rb
diff --git a/cookbooks/build-essential/recipes/debian.rb → ...okbooks/build-essential/recipes/debian.rb b/cookbooks/build-essential/recipes/debian.rb → ...okbooks/build-essential/recipes/debian.rb
diff --git a/cookbooks/build-essential/recipes/default.rb → ...kbooks/build-essential/recipes/default.rb b/cookbooks/build-essential/recipes/default.rb → ...kbooks/build-essential/recipes/default.rb
diff --git a/cookbooks/build-essential/recipes/fedora.rb → ...okbooks/build-essential/recipes/fedora.rb b/cookbooks/build-essential/recipes/fedora.rb → ...okbooks/build-essential/recipes/fedora.rb
diff --git a/...books/build-essential/recipes/mac_os_x.rb → ...books/build-essential/recipes/mac_os_x.rb b/...books/build-essential/recipes/mac_os_x.rb → ...books/build-essential/recipes/mac_os_x.rb
diff --git a/cookbooks/build-essential/recipes/omnios.rb → ...okbooks/build-essential/recipes/omnios.rb b/cookbooks/build-essential/recipes/omnios.rb → ...okbooks/build-essential/recipes/omnios.rb
diff --git a/cookbooks/build-essential/recipes/rhel.rb → ...cookbooks/build-essential/recipes/rhel.rb b/cookbooks/build-essential/recipes/rhel.rb → ...cookbooks/build-essential/recipes/rhel.rb
diff --git a/cookbooks/build-essential/recipes/smartos.rb → ...kbooks/build-essential/recipes/smartos.rb b/cookbooks/build-essential/recipes/smartos.rb → ...kbooks/build-essential/recipes/smartos.rb
diff --git a/...books/build-essential/recipes/solaris2.rb → ...books/build-essential/recipes/solaris2.rb b/...books/build-essential/recipes/solaris2.rb → ...books/build-essential/recipes/solaris2.rb
diff --git a/cookbooks/build-essential/recipes/suse.rb → ...cookbooks/build-essential/recipes/suse.rb b/cookbooks/build-essential/recipes/suse.rb → ...cookbooks/build-essential/recipes/suse.rb
diff --git a/cookbooks/iptables/CHANGELOG.md → chef/cookbooks/iptables/CHANGELOG.md b/cookbooks/iptables/CHANGELOG.md → chef/cookbooks/iptables/CHANGELOG.md
diff --git a/cookbooks/iptables/CONTRIBUTING → chef/cookbooks/iptables/CONTRIBUTING b/cookbooks/iptables/CONTRIBUTING → chef/cookbooks/iptables/CONTRIBUTING
diff --git a/cookbooks/iptables/LICENSE → chef/cookbooks/iptables/LICENSE b/cookbooks/iptables/LICENSE → chef/cookbooks/iptables/LICENSE
diff --git a/cookbooks/iptables/README.md → chef/cookbooks/iptables/README.md b/cookbooks/iptables/README.md → chef/cookbooks/iptables/README.md
diff --git a/...oks/iptables/definitions/iptables_rule.rb → ...oks/iptables/definitions/iptables_rule.rb b/...oks/iptables/definitions/iptables_rule.rb → ...oks/iptables/definitions/iptables_rule.rb
diff --git a/...s/iptables/files/default/rebuild-iptables → ...s/iptables/files/default/rebuild-iptables b/...s/iptables/files/default/rebuild-iptables → ...s/iptables/files/default/rebuild-iptables
diff --git a/cookbooks/iptables/metadata.json → chef/cookbooks/iptables/metadata.json b/cookbooks/iptables/metadata.json → chef/cookbooks/iptables/metadata.json
diff --git a/cookbooks/iptables/metadata.rb → chef/cookbooks/iptables/metadata.rb b/cookbooks/iptables/metadata.rb → chef/cookbooks/iptables/metadata.rb
diff --git a/cookbooks/iptables/recipes/default.rb → chef/cookbooks/iptables/recipes/default.rb b/cookbooks/iptables/recipes/default.rb → chef/cookbooks/iptables/recipes/default.rb
diff --git a/cookbooks/iptables/recipes/disabled.rb → chef/cookbooks/iptables/recipes/disabled.rb b/cookbooks/iptables/recipes/disabled.rb → chef/cookbooks/iptables/recipes/disabled.rb
diff --git a/...les/templates/default/all_established.erb → ...les/templates/default/all_established.erb b/...les/templates/default/all_established.erb → ...les/templates/default/all_established.erb
diff --git a/...s/iptables/templates/default/all_icmp.erb → ...s/iptables/templates/default/all_icmp.erb b/...s/iptables/templates/default/all_icmp.erb → ...s/iptables/templates/default/all_icmp.erb
diff --git a/...ables/templates/default/iptables_load.erb → ...ables/templates/default/iptables_load.erb b/...ables/templates/default/iptables_load.erb → ...ables/templates/default/iptables_load.erb
diff --git a/cookbooks/mysql/CHANGELOG.md → chef/cookbooks/mysql/CHANGELOG.md b/cookbooks/mysql/CHANGELOG.md → chef/cookbooks/mysql/CHANGELOG.md
diff --git a/cookbooks/mysql/README.md → chef/cookbooks/mysql/README.md b/cookbooks/mysql/README.md → chef/cookbooks/mysql/README.md
diff --git a/cookbooks/mysql/attributes/client.rb → chef/cookbooks/mysql/attributes/client.rb b/cookbooks/mysql/attributes/client.rb → chef/cookbooks/mysql/attributes/client.rb
diff --git a/cookbooks/mysql/attributes/percona_repo.rb → ...ookbooks/mysql/attributes/percona_repo.rb b/cookbooks/mysql/attributes/percona_repo.rb → ...ookbooks/mysql/attributes/percona_repo.rb
diff --git a/cookbooks/mysql/attributes/server.rb → chef/cookbooks/mysql/attributes/server.rb b/cookbooks/mysql/attributes/server.rb → chef/cookbooks/mysql/attributes/server.rb
diff --git a/cookbooks/mysql/libraries/helpers.rb → chef/cookbooks/mysql/libraries/helpers.rb b/cookbooks/mysql/libraries/helpers.rb → chef/cookbooks/mysql/libraries/helpers.rb
diff --git a/cookbooks/mysql/metadata.json → chef/cookbooks/mysql/metadata.json b/cookbooks/mysql/metadata.json → chef/cookbooks/mysql/metadata.json
diff --git a/cookbooks/mysql/metadata.rb → chef/cookbooks/mysql/metadata.rb b/cookbooks/mysql/metadata.rb → chef/cookbooks/mysql/metadata.rb
diff --git a/cookbooks/mysql/recipes/client.rb → chef/cookbooks/mysql/recipes/client.rb b/cookbooks/mysql/recipes/client.rb → chef/cookbooks/mysql/recipes/client.rb
diff --git a/cookbooks/mysql/recipes/default.rb → chef/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb → chef/cookbooks/mysql/recipes/default.rb
diff --git a/cookbooks/mysql/recipes/percona_repo.rb → chef/cookbooks/mysql/recipes/percona_repo.rb b/cookbooks/mysql/recipes/percona_repo.rb → chef/cookbooks/mysql/recipes/percona_repo.rb
diff --git a/cookbooks/mysql/recipes/ruby.rb → chef/cookbooks/mysql/recipes/ruby.rb b/cookbooks/mysql/recipes/ruby.rb → chef/cookbooks/mysql/recipes/ruby.rb
diff --git a/cookbooks/mysql/recipes/server.rb → chef/cookbooks/mysql/recipes/server.rb b/cookbooks/mysql/recipes/server.rb → chef/cookbooks/mysql/recipes/server.rb
diff --git a/cookbooks/mysql/recipes/server_ec2.rb → chef/cookbooks/mysql/recipes/server_ec2.rb b/cookbooks/mysql/recipes/server_ec2.rb → chef/cookbooks/mysql/recipes/server_ec2.rb
diff --git a/...ks/mysql/templates/default/debian.cnf.erb → ...ks/mysql/templates/default/debian.cnf.erb b/...ks/mysql/templates/default/debian.cnf.erb → ...ks/mysql/templates/default/debian.cnf.erb
diff --git a/...ks/mysql/templates/default/grants.sql.erb → ...ks/mysql/templates/default/grants.sql.erb b/...ks/mysql/templates/default/grants.sql.erb → ...ks/mysql/templates/default/grants.sql.erb
diff --git a/cookbooks/mysql/templates/default/my.cnf.erb → ...kbooks/mysql/templates/default/my.cnf.erb b/cookbooks/mysql/templates/default/my.cnf.erb → ...kbooks/mysql/templates/default/my.cnf.erb
diff --git a/...l/templates/default/mysql-server.seed.erb → ...l/templates/default/mysql-server.seed.erb b/...l/templates/default/mysql-server.seed.erb → ...l/templates/default/mysql-server.seed.erb
diff --git a/...ks/mysql/templates/default/port_mysql.erb → ...ks/mysql/templates/default/port_mysql.erb b/...ks/mysql/templates/default/port_mysql.erb → ...ks/mysql/templates/default/port_mysql.erb
diff --git a/cookbooks/mysql/templates/windows/my.cnf.erb → ...kbooks/mysql/templates/windows/my.cnf.erb b/cookbooks/mysql/templates/windows/my.cnf.erb → ...kbooks/mysql/templates/windows/my.cnf.erb
diff --git a/cookbooks/openssl/CHANGELOG.md → chef/cookbooks/openssl/CHANGELOG.md b/cookbooks/openssl/CHANGELOG.md → chef/cookbooks/openssl/CHANGELOG.md
diff --git a/cookbooks/openssl/README.md → chef/cookbooks/openssl/README.md b/cookbooks/openssl/README.md → chef/cookbooks/openssl/README.md
diff --git a/...ooks/openssl/libraries/secure_password.rb → ...ooks/openssl/libraries/secure_password.rb b/...ooks/openssl/libraries/secure_password.rb → ...ooks/openssl/libraries/secure_password.rb
diff --git a/cookbooks/openssl/metadata.json → chef/cookbooks/openssl/metadata.json b/cookbooks/openssl/metadata.json → chef/cookbooks/openssl/metadata.json
diff --git a/cookbooks/openssl/metadata.rb → chef/cookbooks/openssl/metadata.rb b/cookbooks/openssl/metadata.rb → chef/cookbooks/openssl/metadata.rb
diff --git a/cookbooks/openssl/recipes/default.rb → chef/cookbooks/openssl/recipes/default.rb b/cookbooks/openssl/recipes/default.rb → chef/cookbooks/openssl/recipes/default.rb
diff --git a/cookbooks/php/CHANGELOG.md → chef/cookbooks/php/CHANGELOG.md b/cookbooks/php/CHANGELOG.md → chef/cookbooks/php/CHANGELOG.md
diff --git a/cookbooks/php/README.md → chef/cookbooks/php/README.md b/cookbooks/php/README.md → chef/cookbooks/php/README.md
diff --git a/cookbooks/php/attributes/default.rb → chef/cookbooks/php/attributes/default.rb b/cookbooks/php/attributes/default.rb → chef/cookbooks/php/attributes/default.rb
diff --git a/cookbooks/php/libraries/helpers.rb → chef/cookbooks/php/libraries/helpers.rb b/cookbooks/php/libraries/helpers.rb → chef/cookbooks/php/libraries/helpers.rb
diff --git a/cookbooks/php/metadata.json → chef/cookbooks/php/metadata.json b/cookbooks/php/metadata.json → chef/cookbooks/php/metadata.json
diff --git a/cookbooks/php/metadata.rb → chef/cookbooks/php/metadata.rb b/cookbooks/php/metadata.rb → chef/cookbooks/php/metadata.rb
diff --git a/cookbooks/php/providers/pear.rb → chef/cookbooks/php/providers/pear.rb b/cookbooks/php/providers/pear.rb → chef/cookbooks/php/providers/pear.rb
diff --git a/cookbooks/php/providers/pear_channel.rb → chef/cookbooks/php/providers/pear_channel.rb b/cookbooks/php/providers/pear_channel.rb → chef/cookbooks/php/providers/pear_channel.rb
diff --git a/cookbooks/php/recipes/default.rb → chef/cookbooks/php/recipes/default.rb b/cookbooks/php/recipes/default.rb → chef/cookbooks/php/recipes/default.rb
diff --git a/cookbooks/php/recipes/module_apc.rb → chef/cookbooks/php/recipes/module_apc.rb b/cookbooks/php/recipes/module_apc.rb → chef/cookbooks/php/recipes/module_apc.rb
diff --git a/cookbooks/php/recipes/module_curl.rb → chef/cookbooks/php/recipes/module_curl.rb b/cookbooks/php/recipes/module_curl.rb → chef/cookbooks/php/recipes/module_curl.rb
diff --git a/cookbooks/php/recipes/module_fpdf.rb → chef/cookbooks/php/recipes/module_fpdf.rb b/cookbooks/php/recipes/module_fpdf.rb → chef/cookbooks/php/recipes/module_fpdf.rb
diff --git a/cookbooks/php/recipes/module_gd.rb → chef/cookbooks/php/recipes/module_gd.rb b/cookbooks/php/recipes/module_gd.rb → chef/cookbooks/php/recipes/module_gd.rb
diff --git a/cookbooks/php/recipes/module_ldap.rb → chef/cookbooks/php/recipes/module_ldap.rb b/cookbooks/php/recipes/module_ldap.rb → chef/cookbooks/php/recipes/module_ldap.rb
diff --git a/cookbooks/php/recipes/module_memcache.rb → .../cookbooks/php/recipes/module_memcache.rb b/cookbooks/php/recipes/module_memcache.rb → .../cookbooks/php/recipes/module_memcache.rb
diff --git a/cookbooks/php/recipes/module_mysql.rb → chef/cookbooks/php/recipes/module_mysql.rb b/cookbooks/php/recipes/module_mysql.rb → chef/cookbooks/php/recipes/module_mysql.rb
diff --git a/cookbooks/php/recipes/module_pgsql.rb → chef/cookbooks/php/recipes/module_pgsql.rb b/cookbooks/php/recipes/module_pgsql.rb → chef/cookbooks/php/recipes/module_pgsql.rb
diff --git a/cookbooks/php/recipes/module_sqlite3.rb → chef/cookbooks/php/recipes/module_sqlite3.rb b/cookbooks/php/recipes/module_sqlite3.rb → chef/cookbooks/php/recipes/module_sqlite3.rb
diff --git a/cookbooks/php/recipes/package.rb → chef/cookbooks/php/recipes/package.rb b/cookbooks/php/recipes/package.rb → chef/cookbooks/php/recipes/package.rb
diff --git a/cookbooks/php/recipes/source.rb → chef/cookbooks/php/recipes/source.rb b/cookbooks/php/recipes/source.rb → chef/cookbooks/php/recipes/source.rb
diff --git a/cookbooks/php/resources/pear.rb → chef/cookbooks/php/resources/pear.rb b/cookbooks/php/resources/pear.rb → chef/cookbooks/php/resources/pear.rb
diff --git a/cookbooks/php/resources/pear_channel.rb → chef/cookbooks/php/resources/pear_channel.rb b/cookbooks/php/resources/pear_channel.rb → chef/cookbooks/php/resources/pear_channel.rb
diff --git a/cookbooks/php/templates/centos/php.ini.erb → ...ookbooks/php/templates/centos/php.ini.erb b/cookbooks/php/templates/centos/php.ini.erb → ...ookbooks/php/templates/centos/php.ini.erb
diff --git a/cookbooks/php/templates/debian/php.ini.erb → ...ookbooks/php/templates/debian/php.ini.erb b/cookbooks/php/templates/debian/php.ini.erb → ...ookbooks/php/templates/debian/php.ini.erb
diff --git a/...s/php/templates/default/extension.ini.erb → ...s/php/templates/default/extension.ini.erb b/...s/php/templates/default/extension.ini.erb → ...s/php/templates/default/extension.ini.erb
diff --git a/cookbooks/php/templates/default/php.ini.erb → ...okbooks/php/templates/default/php.ini.erb b/cookbooks/php/templates/default/php.ini.erb → ...okbooks/php/templates/default/php.ini.erb
diff --git a/cookbooks/php/templates/redhat/php.ini.erb → ...ookbooks/php/templates/redhat/php.ini.erb b/cookbooks/php/templates/redhat/php.ini.erb → ...ookbooks/php/templates/redhat/php.ini.erb
diff --git a/cookbooks/php/templates/ubuntu/php.ini.erb → ...ookbooks/php/templates/ubuntu/php.ini.erb b/cookbooks/php/templates/ubuntu/php.ini.erb → ...ookbooks/php/templates/ubuntu/php.ini.erb
diff --git a/cookbooks/rbenv/.kitchen.yml → chef/cookbooks/rbenv/.kitchen.yml b/cookbooks/rbenv/.kitchen.yml → chef/cookbooks/rbenv/.kitchen.yml
diff --git a/cookbooks/rbenv/.rspec → chef/cookbooks/rbenv/.rspec b/cookbooks/rbenv/.rspec → chef/cookbooks/rbenv/.rspec
diff --git a/cookbooks/rbenv/.travis.yml → chef/cookbooks/rbenv/.travis.yml b/cookbooks/rbenv/.travis.yml → chef/cookbooks/rbenv/.travis.yml
diff --git a/cookbooks/rbenv/Berksfile → chef/cookbooks/rbenv/Berksfile b/cookbooks/rbenv/Berksfile → chef/cookbooks/rbenv/Berksfile
diff --git a/cookbooks/rbenv/CHANGELOG.md → chef/cookbooks/rbenv/CHANGELOG.md b/cookbooks/rbenv/CHANGELOG.md → chef/cookbooks/rbenv/CHANGELOG.md
diff --git a/cookbooks/rbenv/Gemfile → chef/cookbooks/rbenv/Gemfile b/cookbooks/rbenv/Gemfile → chef/cookbooks/rbenv/Gemfile
diff --git a/cookbooks/rbenv/Guardfile → chef/cookbooks/rbenv/Guardfile b/cookbooks/rbenv/Guardfile → chef/cookbooks/rbenv/Guardfile
diff --git a/cookbooks/rbenv/README.md → chef/cookbooks/rbenv/README.md b/cookbooks/rbenv/README.md → chef/cookbooks/rbenv/README.md
diff --git a/cookbooks/rbenv/Rakefile → chef/cookbooks/rbenv/Rakefile b/cookbooks/rbenv/Rakefile → chef/cookbooks/rbenv/Rakefile
diff --git a/cookbooks/rbenv/attributes/default.rb → chef/cookbooks/rbenv/attributes/default.rb b/cookbooks/rbenv/attributes/default.rb → chef/cookbooks/rbenv/attributes/default.rb
diff --git a/...es/chef_provider_package_rbenvrubygems.rb → ...es/chef_provider_package_rbenvrubygems.rb b/...es/chef_provider_package_rbenvrubygems.rb → ...es/chef_provider_package_rbenvrubygems.rb
diff --git a/...books/rbenv/libraries/chef_rbenv_mixin.rb → ...books/rbenv/libraries/chef_rbenv_mixin.rb b/...books/rbenv/libraries/chef_rbenv_mixin.rb → ...books/rbenv/libraries/chef_rbenv_mixin.rb
diff --git a/...nv/libraries/chef_rbenv_recipe_helpers.rb → ...nv/libraries/chef_rbenv_recipe_helpers.rb b/...nv/libraries/chef_rbenv_recipe_helpers.rb → ...nv/libraries/chef_rbenv_recipe_helpers.rb
diff --git a/...nv/libraries/chef_rbenv_script_helpers.rb → ...nv/libraries/chef_rbenv_script_helpers.rb b/...nv/libraries/chef_rbenv_script_helpers.rb → ...nv/libraries/chef_rbenv_script_helpers.rb
diff --git a/cookbooks/rbenv/libraries/matchers.rb → chef/cookbooks/rbenv/libraries/matchers.rb b/cookbooks/rbenv/libraries/matchers.rb → chef/cookbooks/rbenv/libraries/matchers.rb
diff --git a/cookbooks/rbenv/metadata.rb → chef/cookbooks/rbenv/metadata.rb b/cookbooks/rbenv/metadata.rb → chef/cookbooks/rbenv/metadata.rb
diff --git a/cookbooks/rbenv/providers/global.rb → chef/cookbooks/rbenv/providers/global.rb b/cookbooks/rbenv/providers/global.rb → chef/cookbooks/rbenv/providers/global.rb
diff --git a/cookbooks/rbenv/providers/plugin.rb → chef/cookbooks/rbenv/providers/plugin.rb b/cookbooks/rbenv/providers/plugin.rb → chef/cookbooks/rbenv/providers/plugin.rb
diff --git a/cookbooks/rbenv/providers/rehash.rb → chef/cookbooks/rbenv/providers/rehash.rb b/cookbooks/rbenv/providers/rehash.rb → chef/cookbooks/rbenv/providers/rehash.rb
diff --git a/cookbooks/rbenv/providers/ruby.rb → chef/cookbooks/rbenv/providers/ruby.rb b/cookbooks/rbenv/providers/ruby.rb → chef/cookbooks/rbenv/providers/ruby.rb
diff --git a/cookbooks/rbenv/providers/script.rb → chef/cookbooks/rbenv/providers/script.rb b/cookbooks/rbenv/providers/script.rb → chef/cookbooks/rbenv/providers/script.rb
diff --git a/cookbooks/rbenv/recipes/default.rb → chef/cookbooks/rbenv/recipes/default.rb b/cookbooks/rbenv/recipes/default.rb → chef/cookbooks/rbenv/recipes/default.rb
diff --git a/cookbooks/rbenv/recipes/system.rb → chef/cookbooks/rbenv/recipes/system.rb b/cookbooks/rbenv/recipes/system.rb → chef/cookbooks/rbenv/recipes/system.rb
diff --git a/cookbooks/rbenv/recipes/system_install.rb → ...cookbooks/rbenv/recipes/system_install.rb b/cookbooks/rbenv/recipes/system_install.rb → ...cookbooks/rbenv/recipes/system_install.rb
diff --git a/cookbooks/rbenv/recipes/user.rb → chef/cookbooks/rbenv/recipes/user.rb b/cookbooks/rbenv/recipes/user.rb → chef/cookbooks/rbenv/recipes/user.rb
diff --git a/cookbooks/rbenv/recipes/user_install.rb → chef/cookbooks/rbenv/recipes/user_install.rb b/cookbooks/rbenv/recipes/user_install.rb → chef/cookbooks/rbenv/recipes/user_install.rb
diff --git a/cookbooks/rbenv/recipes/vagrant.rb → chef/cookbooks/rbenv/recipes/vagrant.rb b/cookbooks/rbenv/recipes/vagrant.rb → chef/cookbooks/rbenv/recipes/vagrant.rb
diff --git a/cookbooks/rbenv/resources/gem.rb → chef/cookbooks/rbenv/resources/gem.rb b/cookbooks/rbenv/resources/gem.rb → chef/cookbooks/rbenv/resources/gem.rb
diff --git a/cookbooks/rbenv/resources/global.rb → chef/cookbooks/rbenv/resources/global.rb b/cookbooks/rbenv/resources/global.rb → chef/cookbooks/rbenv/resources/global.rb
diff --git a/cookbooks/rbenv/resources/plugin.rb → chef/cookbooks/rbenv/resources/plugin.rb b/cookbooks/rbenv/resources/plugin.rb → chef/cookbooks/rbenv/resources/plugin.rb
diff --git a/cookbooks/rbenv/resources/rehash.rb → chef/cookbooks/rbenv/resources/rehash.rb b/cookbooks/rbenv/resources/rehash.rb → chef/cookbooks/rbenv/resources/rehash.rb
diff --git a/cookbooks/rbenv/resources/ruby.rb → chef/cookbooks/rbenv/resources/ruby.rb b/cookbooks/rbenv/resources/ruby.rb → chef/cookbooks/rbenv/resources/ruby.rb
diff --git a/cookbooks/rbenv/resources/script.rb → chef/cookbooks/rbenv/resources/script.rb b/cookbooks/rbenv/resources/script.rb → chef/cookbooks/rbenv/resources/script.rb
diff --git a/...ooks/rbenv/templates/default/rbenv.sh.erb → ...ooks/rbenv/templates/default/rbenv.sh.erb b/...ooks/rbenv/templates/default/rbenv.sh.erb → ...ooks/rbenv/templates/default/rbenv.sh.erb
diff --git a/...gration/system_ruby/bats/global_ruby.bats → ...gration/system_ruby/bats/global_ruby.bats b/...gration/system_ruby/bats/global_ruby.bats → ...gration/system_ruby/bats/global_ruby.bats
diff --git a/...ration/system_ruby/bats/installation.bats → ...ration/system_ruby/bats/installation.bats b/...ration/system_ruby/bats/installation.bats → ...ration/system_ruby/bats/installation.bats
diff --git a/...integration/system_ruby/bats/plugins.bats → ...integration/system_ruby/bats/plugins.bats b/...integration/system_ruby/bats/plugins.bats → ...integration/system_ruby/bats/plugins.bats
diff --git a/...ration/system_ruby/bats/ruby_envvars.bats → ...ration/system_ruby/bats/ruby_envvars.bats b/...ration/system_ruby/bats/ruby_envvars.bats → ...ration/system_ruby/bats/ruby_envvars.bats
diff --git a/...ooks/rbenv/test/unit/fixtures/metadata.rb → ...ooks/rbenv/test/unit/fixtures/metadata.rb b/...ooks/rbenv/test/unit/fixtures/metadata.rb → ...ooks/rbenv/test/unit/fixtures/metadata.rb
diff --git a/...fixtures/recipes/rbenv_global_defaults.rb → ...fixtures/recipes/rbenv_global_defaults.rb b/...fixtures/recipes/rbenv_global_defaults.rb → ...fixtures/recipes/rbenv_global_defaults.rb
diff --git a/...nit/fixtures/recipes/rbenv_global_full.rb → ...nit/fixtures/recipes/rbenv_global_full.rb b/...nit/fixtures/recipes/rbenv_global_full.rb → ...nit/fixtures/recipes/rbenv_global_full.rb
diff --git a/...fixtures/recipes/rbenv_plugin_defaults.rb → ...fixtures/recipes/rbenv_plugin_defaults.rb b/...fixtures/recipes/rbenv_plugin_defaults.rb → ...fixtures/recipes/rbenv_plugin_defaults.rb
diff --git a/...nit/fixtures/recipes/rbenv_plugin_full.rb → ...nit/fixtures/recipes/rbenv_plugin_full.rb b/...nit/fixtures/recipes/rbenv_plugin_full.rb → ...nit/fixtures/recipes/rbenv_plugin_full.rb
diff --git a/...fixtures/recipes/rbenv_rehash_defaults.rb → ...fixtures/recipes/rbenv_rehash_defaults.rb b/...fixtures/recipes/rbenv_rehash_defaults.rb → ...fixtures/recipes/rbenv_rehash_defaults.rb
diff --git a/...nit/fixtures/recipes/rbenv_rehash_full.rb → ...nit/fixtures/recipes/rbenv_rehash_full.rb b/...nit/fixtures/recipes/rbenv_rehash_full.rb → ...nit/fixtures/recipes/rbenv_rehash_full.rb
diff --git a/...fixtures/recipes/rbenv_script_defaults.rb → ...fixtures/recipes/rbenv_script_defaults.rb b/...fixtures/recipes/rbenv_script_defaults.rb → ...fixtures/recipes/rbenv_script_defaults.rb
diff --git a/...nit/fixtures/recipes/rbenv_script_full.rb → ...nit/fixtures/recipes/rbenv_script_full.rb b/...nit/fixtures/recipes/rbenv_script_full.rb → ...nit/fixtures/recipes/rbenv_script_full.rb
diff --git a/.../rbenv/test/unit/providers/global_spec.rb → .../rbenv/test/unit/providers/global_spec.rb b/.../rbenv/test/unit/providers/global_spec.rb → .../rbenv/test/unit/providers/global_spec.rb
diff --git a/.../rbenv/test/unit/providers/plugin_spec.rb → .../rbenv/test/unit/providers/plugin_spec.rb b/.../rbenv/test/unit/providers/plugin_spec.rb → .../rbenv/test/unit/providers/plugin_spec.rb
diff --git a/.../rbenv/test/unit/providers/rehash_spec.rb → .../rbenv/test/unit/providers/rehash_spec.rb b/.../rbenv/test/unit/providers/rehash_spec.rb → .../rbenv/test/unit/providers/rehash_spec.rb
diff --git a/.../rbenv/test/unit/providers/script_spec.rb → .../rbenv/test/unit/providers/script_spec.rb b/.../rbenv/test/unit/providers/script_spec.rb → .../rbenv/test/unit/providers/script_spec.rb
diff --git a/...oks/rbenv/test/unit/resources/gem_spec.rb → ...oks/rbenv/test/unit/resources/gem_spec.rb b/...oks/rbenv/test/unit/resources/gem_spec.rb → ...oks/rbenv/test/unit/resources/gem_spec.rb
diff --git a/.../rbenv/test/unit/resources/global_spec.rb → .../rbenv/test/unit/resources/global_spec.rb b/.../rbenv/test/unit/resources/global_spec.rb → .../rbenv/test/unit/resources/global_spec.rb
diff --git a/.../rbenv/test/unit/resources/plugin_spec.rb → .../rbenv/test/unit/resources/plugin_spec.rb b/.../rbenv/test/unit/resources/plugin_spec.rb → .../rbenv/test/unit/resources/plugin_spec.rb
diff --git a/.../rbenv/test/unit/resources/rehash_spec.rb → .../rbenv/test/unit/resources/rehash_spec.rb b/.../rbenv/test/unit/resources/rehash_spec.rb → .../rbenv/test/unit/resources/rehash_spec.rb
diff --git a/...ks/rbenv/test/unit/resources/ruby_spec.rb → ...ks/rbenv/test/unit/resources/ruby_spec.rb b/...ks/rbenv/test/unit/resources/ruby_spec.rb → ...ks/rbenv/test/unit/resources/ruby_spec.rb
diff --git a/.../rbenv/test/unit/resources/script_spec.rb → .../rbenv/test/unit/resources/script_spec.rb b/.../rbenv/test/unit/resources/script_spec.rb → .../rbenv/test/unit/resources/script_spec.rb
diff --git a/cookbooks/rbenv/test/unit/spec_helper.rb → .../cookbooks/rbenv/test/unit/spec_helper.rb b/cookbooks/rbenv/test/unit/spec_helper.rb → .../cookbooks/rbenv/test/unit/spec_helper.rb
diff --git a/cookbooks/ruby_build/.kitchen.yml → chef/cookbooks/ruby_build/.kitchen.yml b/cookbooks/ruby_build/.kitchen.yml → chef/cookbooks/ruby_build/.kitchen.yml
diff --git a/cookbooks/ruby_build/.travis.yml → chef/cookbooks/ruby_build/.travis.yml b/cookbooks/ruby_build/.travis.yml → chef/cookbooks/ruby_build/.travis.yml
diff --git a/cookbooks/ruby_build/Berksfile → chef/cookbooks/ruby_build/Berksfile b/cookbooks/ruby_build/Berksfile → chef/cookbooks/ruby_build/Berksfile
diff --git a/cookbooks/ruby_build/CHANGELOG.md → chef/cookbooks/ruby_build/CHANGELOG.md b/cookbooks/ruby_build/CHANGELOG.md → chef/cookbooks/ruby_build/CHANGELOG.md
diff --git a/cookbooks/ruby_build/Gemfile → chef/cookbooks/ruby_build/Gemfile b/cookbooks/ruby_build/Gemfile → chef/cookbooks/ruby_build/Gemfile
diff --git a/cookbooks/ruby_build/README.md → chef/cookbooks/ruby_build/README.md b/cookbooks/ruby_build/README.md → chef/cookbooks/ruby_build/README.md
diff --git a/cookbooks/ruby_build/Rakefile → chef/cookbooks/ruby_build/Rakefile b/cookbooks/ruby_build/Rakefile → chef/cookbooks/ruby_build/Rakefile
diff --git a/cookbooks/ruby_build/attributes/default.rb → ...ookbooks/ruby_build/attributes/default.rb b/cookbooks/ruby_build/attributes/default.rb → ...ookbooks/ruby_build/attributes/default.rb
diff --git a/cookbooks/ruby_build/chefignore → chef/cookbooks/ruby_build/chefignore b/cookbooks/ruby_build/chefignore → chef/cookbooks/ruby_build/chefignore
diff --git a/...ld/libraries/ruby_build_recipe_helpers.rb → ...ld/libraries/ruby_build_recipe_helpers.rb b/...ld/libraries/ruby_build_recipe_helpers.rb → ...ld/libraries/ruby_build_recipe_helpers.rb
diff --git a/cookbooks/ruby_build/metadata.rb → chef/cookbooks/ruby_build/metadata.rb b/cookbooks/ruby_build/metadata.rb → chef/cookbooks/ruby_build/metadata.rb
diff --git a/cookbooks/ruby_build/providers/ruby.rb → chef/cookbooks/ruby_build/providers/ruby.rb b/cookbooks/ruby_build/providers/ruby.rb → chef/cookbooks/ruby_build/providers/ruby.rb
diff --git a/cookbooks/ruby_build/recipes/default.rb → chef/cookbooks/ruby_build/recipes/default.rb b/cookbooks/ruby_build/recipes/default.rb → chef/cookbooks/ruby_build/recipes/default.rb
diff --git a/cookbooks/ruby_build/resources/ruby.rb → chef/cookbooks/ruby_build/resources/ruby.rb b/cookbooks/ruby_build/resources/ruby.rb → chef/cookbooks/ruby_build/resources/ruby.rb
diff --git a/...d/test/cookbooks/alltherubies/metadata.rb → ...d/test/cookbooks/alltherubies/metadata.rb b/...d/test/cookbooks/alltherubies/metadata.rb → ...d/test/cookbooks/alltherubies/metadata.rb
diff --git a/...cookbooks/alltherubies/recipes/default.rb → ...cookbooks/alltherubies/recipes/default.rb b/...cookbooks/alltherubies/recipes/default.rb → ...cookbooks/alltherubies/recipes/default.rb
diff --git a/...tion/alltherubies/bats/_verify_tests.bash → ...tion/alltherubies/bats/_verify_tests.bash b/...tion/alltherubies/bats/_verify_tests.bash → ...tion/alltherubies/bats/_verify_tests.bash
diff --git a/...ation/alltherubies/bats/verify_1.8.7.bats → ...ation/alltherubies/bats/verify_1.8.7.bats b/...ation/alltherubies/bats/verify_1.8.7.bats → ...ation/alltherubies/bats/verify_1.8.7.bats
diff --git a/...ation/alltherubies/bats/verify_1.9.2.bats → ...ation/alltherubies/bats/verify_1.9.2.bats b/...ation/alltherubies/bats/verify_1.9.2.bats → ...ation/alltherubies/bats/verify_1.9.2.bats
diff --git a/...ation/alltherubies/bats/verify_1.9.3.bats → ...ation/alltherubies/bats/verify_1.9.3.bats b/...ation/alltherubies/bats/verify_1.9.3.bats → ...ation/alltherubies/bats/verify_1.9.3.bats
diff --git a/...ation/alltherubies/bats/verify_2.0.0.bats → ...ation/alltherubies/bats/verify_2.0.0.bats b/...ation/alltherubies/bats/verify_2.0.0.bats → ...ation/alltherubies/bats/verify_2.0.0.bats
diff --git a/...ation/alltherubies/bats/verify_jruby.bats → ...ation/alltherubies/bats/verify_jruby.bats b/...ation/alltherubies/bats/verify_jruby.bats → ...ation/alltherubies/bats/verify_jruby.bats
diff --git a/...gration/alltherubies/bats/verify_rbx.bats → ...gration/alltherubies/bats/verify_rbx.bats b/...gration/alltherubies/bats/verify_rbx.bats → ...gration/alltherubies/bats/verify_rbx.bats
diff --git a/...gration/alltherubies/bats/verify_ree.bats → ...gration/alltherubies/bats/verify_ree.bats b/...gration/alltherubies/bats/verify_ree.bats → ...gration/alltherubies/bats/verify_ree.bats
diff --git a/...ation/installation/bats/installation.bats → ...ation/installation/bats/installation.bats b/...ation/installation/bats/installation.bats → ...ation/installation/bats/installation.bats
diff --git a/cookbooks/xml/CHANGELOG.md → chef/cookbooks/xml/CHANGELOG.md b/cookbooks/xml/CHANGELOG.md → chef/cookbooks/xml/CHANGELOG.md
diff --git a/cookbooks/xml/CONTRIBUTING → chef/cookbooks/xml/CONTRIBUTING b/cookbooks/xml/CONTRIBUTING → chef/cookbooks/xml/CONTRIBUTING
diff --git a/cookbooks/xml/LICENSE → chef/cookbooks/xml/LICENSE b/cookbooks/xml/LICENSE → chef/cookbooks/xml/LICENSE
diff --git a/cookbooks/xml/README.md → chef/cookbooks/xml/README.md b/cookbooks/xml/README.md → chef/cookbooks/xml/README.md
diff --git a/cookbooks/xml/attributes/default.rb → chef/cookbooks/xml/attributes/default.rb b/cookbooks/xml/attributes/default.rb → chef/cookbooks/xml/attributes/default.rb
diff --git a/cookbooks/xml/metadata.json → chef/cookbooks/xml/metadata.json b/cookbooks/xml/metadata.json → chef/cookbooks/xml/metadata.json
diff --git a/cookbooks/xml/metadata.rb → chef/cookbooks/xml/metadata.rb b/cookbooks/xml/metadata.rb → chef/cookbooks/xml/metadata.rb
diff --git a/cookbooks/xml/recipes/default.rb → chef/cookbooks/xml/recipes/default.rb b/cookbooks/xml/recipes/default.rb → chef/cookbooks/xml/recipes/default.rb
diff --git a/cookbooks/xml/recipes/ruby.rb → chef/cookbooks/xml/recipes/ruby.rb b/cookbooks/xml/recipes/ruby.rb → chef/cookbooks/xml/recipes/ruby.rb
diff --git a/cookbooks/yum/CHANGELOG.md → chef/cookbooks/yum/CHANGELOG.md b/cookbooks/yum/CHANGELOG.md → chef/cookbooks/yum/CHANGELOG.md
diff --git a/cookbooks/yum/README.md → chef/cookbooks/yum/README.md b/cookbooks/yum/README.md → chef/cookbooks/yum/README.md
diff --git a/cookbooks/yum/attributes/default.rb → chef/cookbooks/yum/attributes/default.rb b/cookbooks/yum/attributes/default.rb → chef/cookbooks/yum/attributes/default.rb
diff --git a/cookbooks/yum/attributes/elrepo.rb → chef/cookbooks/yum/attributes/elrepo.rb b/cookbooks/yum/attributes/elrepo.rb → chef/cookbooks/yum/attributes/elrepo.rb
diff --git a/cookbooks/yum/attributes/epel.rb → chef/cookbooks/yum/attributes/epel.rb b/cookbooks/yum/attributes/epel.rb → chef/cookbooks/yum/attributes/epel.rb
diff --git a/cookbooks/yum/attributes/remi.rb → chef/cookbooks/yum/attributes/remi.rb b/cookbooks/yum/attributes/remi.rb → chef/cookbooks/yum/attributes/remi.rb
diff --git a/...es/default/tests/minitest/default_test.rb → ...es/default/tests/minitest/default_test.rb b/...es/default/tests/minitest/default_test.rb → ...es/default/tests/minitest/default_test.rb