Permalink
Browse files

cleanup and tabs vs spaces 'THIS IS RUBY :KICK:'

  • Loading branch information...
grosser committed Feb 10, 2013
1 parent 705d778 commit c3aa7c499a23ea83f282c087bf62f9109c10bf61
Showing with 54 additions and 58 deletions.
  1. +19 −0 MIT-LICENSE
  2. +6 −28 README.md
  3. +27 −30 Vagrantfile
  4. 0 cookbooks/.gitkeep
  5. +2 −0 cookbooks/fixup/recipes/default.rb
View
@@ -0,0 +1,19 @@
+Copyright (C) 2011 Tom de Grunt <tom@degrunt.nl>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
View
@@ -2,36 +2,14 @@
Vagrant file & cookbooks to install chef-server in VM
-## NOTES
-
-There seems to be a problem with the installation, which seems related to the gem.
-The chef deamons files in `/etc/init.d` have incorrect paths in their `DAEMON` parameter, incorrectly referring to `/usr/bin` instead of `/usr/sbin`. In the meantime this will solve the issue:
-
## Using
+```Bash
+bundle
+bundle exec vagrant up
+```
+
Once the above is done go to [http://localhost:4000](http://localhost:4000) to see REST API working.
The Web UI is on [http://localhost:4040](http://localhost:4040).
-# License
-
-vagrant-chef-server-bootstrap is licensed under MIT license.
-
- Copyright (C) 2011 Tom de Grunt <tom@degrunt.nl>
-
- Permission is hereby granted, free of charge, to any person obtaining a copy of
- this software and associated documentation files (the "Software"), to deal in
- the Software without restriction, including without limitation the rights to
- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is furnished to do
- so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
+# License: MIT
View
@@ -1,34 +1,31 @@
require "berkshelf/vagrant"
Vagrant::Config.run do |config|
-
- config.vm.define "chef-server" do |chefs_config|
-
- chefs_config.vm.box = "precise64"
- chefs_config.vm.box_url = "http://files.vagrantup.com/precise64.box"
- chefs_config.vm.host_name = "chefserver"
- chefs_config.vm.forward_port 4000, 4000
- chefs_config.vm.forward_port 4040, 4040
- chefs_config.vm.forward_port 22, 2223
-
- config.vm.provision :chef_solo do |chef|
-
- chef.log_level = :debug
-
- chef.cookbooks_path = "cookbooks"
- chef.run_list.clear
-
- chef.json = {
- :chef_server=> {
- :url=> "http://localhost:4000",
- :webui_enabled=> true,
- }
- }
-
- chef.add_recipe "apt"
- chef.add_recipe "build-essential"
- chef.add_recipe "chef-server::rubygems-install"
- chef.add_recipe "fixup"
- end
- end
+ config.vm.define "chef-server" do |chefs_config|
+ chefs_config.vm.box = "precise64"
+ chefs_config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+ chefs_config.vm.host_name = "chefserver"
+ chefs_config.vm.forward_port 4000, 4000
+ chefs_config.vm.forward_port 4040, 4040
+ chefs_config.vm.forward_port 22, 2223
+
+ config.vm.provision :chef_solo do |chef|
+ chef.log_level = :debug
+
+ chef.cookbooks_path = "cookbooks"
+ chef.run_list.clear
+
+ chef.json = {
+ :chef_server=> {
+ :url=> "http://localhost:4000",
+ :webui_enabled=> true,
+ }
+ }
+
+ chef.add_recipe "apt"
+ chef.add_recipe "build-essential"
+ chef.add_recipe "chef-server::rubygems-install"
+ chef.add_recipe "fixup"
+ end
+ end
end
View
No changes.
@@ -1,3 +1,5 @@
+# There seems to be a problem with the installation, which seems related to the gem.
+# The chef deamons files in `/etc/init.d` have incorrect paths in their `DAEMON` parameter, incorrectly referring to `/usr/bin` instead of `/usr/sbin`. In the meantime this will solve the issue:
execute "fix bin folders" do
command <<-BASH.gsub(" ", "")
# fix symlinks

0 comments on commit c3aa7c4

Please sign in to comment.