diff --git a/.hound.yml b/.hound.yml new file mode 100644 index 00000000..e0e49fdc --- /dev/null +++ b/.hound.yml @@ -0,0 +1,3 @@ +Style/LineLength: + Description: 'Limit lines to 130 characters.' + Max: 130 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f343a60..42f11608 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ This project makes use of the [Sementic Versioning](http://semver.org/) ### Misc - Sudo recipe configuration changed to match Ubuntu's default sudo behaviour more closely. +- Licensing has been moved to MIT ## 2.2.0 - 2014-10-28 diff --git a/Gemfile b/Gemfile index b57134fd..88c531bb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ source "https://rubygems.org" +gem "rake" gem "chef", "~> 11.16.2" gem "knife-solo", "~> 0.4.1" gem "librarian-chef", "~> 0.0.4" diff --git a/Gemfile.lock b/Gemfile.lock index 753fdf7f..39ee0fc5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -113,6 +113,7 @@ GEM method_source (~> 0.8.1) slop (~> 3.4) rack (1.5.2) + rake (10.3.2) resource_kit (0.0.5) activesupport (>= 3.0) addressable (~> 2.3.6) @@ -170,6 +171,7 @@ DEPENDENCIES kitchen-vagrant knife-solo (~> 0.4.1) librarian-chef (~> 0.0.4) + rake rspec serverspec test-kitchen diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..30983572 --- /dev/null +++ b/LICENSE @@ -0,0 +1,7 @@ +Copyright (c) 2014 Firmhouse.com + +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. diff --git a/config/rake.rb b/config/rake.rb index 00f28d57..f0eca741 100644 --- a/config/rake.rb +++ b/config/rake.rb @@ -25,7 +25,7 @@ # License for new Cookbooks # Can be :apachev2 or :none -NEW_COOKBOOK_LICENSE = :apachev2 +NEW_COOKBOOK_LICENSE = :none ### # Useful Extras (which you probably don't need to change) diff --git a/nodes/sample_host.json b/nodes/sample_host.json index 5822c03c..1525a285 100644 --- a/nodes/sample_host.json +++ b/nodes/sample_host.json @@ -14,7 +14,7 @@ "ssh-rsa AAA456...uvw== bar" ] } - } + }, "ssh_deploy_keys": [ "" ], @@ -37,6 +37,7 @@ "rails_env": "", "packages": ["nodejs"], "domain_names": ["", "", "<...>"], + "redirect_domain_names": ["", "", "<...>"], "ruby_version": "2.1.0", "ssl_info": { "key": "", diff --git a/vendor/cookbooks/backups/metadata.rb b/vendor/cookbooks/backups/metadata.rb index 4ec20439..801f20d4 100644 --- a/vendor/cookbooks/backups/metadata.rb +++ b/vendor/cookbooks/backups/metadata.rb @@ -1,7 +1,7 @@ name "backups" maintainer "Firmhouse" maintainer_email "hello@firmhouse.com" -license "Apache 2.0" +license "MIT" description "Installs/Configures backups" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version "0.1.0" diff --git a/vendor/cookbooks/backups/recipes/default.rb b/vendor/cookbooks/backups/recipes/default.rb index 73c6d0f4..bb28979c 100644 --- a/vendor/cookbooks/backups/recipes/default.rb +++ b/vendor/cookbooks/backups/recipes/default.rb @@ -1,20 +1,25 @@ -# # Cookbook Name:: backups # Recipe:: default # # Copyright 2014, Firmhouse # -# 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. +# 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. backup_node = node[:backups] diff --git a/vendor/cookbooks/packages/metadata.rb b/vendor/cookbooks/packages/metadata.rb index 12131f64..7d3f2ab8 100644 --- a/vendor/cookbooks/packages/metadata.rb +++ b/vendor/cookbooks/packages/metadata.rb @@ -1,6 +1,7 @@ +name "packages" maintainer "Michiel Sikkes" maintainer_email "michiel@firmhouse.com" -license "Apache 2.0" +license "MIT" description "Installs/Configures packages" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version "0.1.0" diff --git a/vendor/cookbooks/packages/recipes/default.rb b/vendor/cookbooks/packages/recipes/default.rb index 16ec2bc9..e5f98d59 100644 --- a/vendor/cookbooks/packages/recipes/default.rb +++ b/vendor/cookbooks/packages/recipes/default.rb @@ -4,23 +4,28 @@ # # Copyright 2012, Michiel Sikkes # -# 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. -# +# 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. +# if node[:packages] node[:packages].each do |package| package package end -end \ No newline at end of file +end diff --git a/vendor/cookbooks/rails/CHANGELOG.md b/vendor/cookbooks/rails/CHANGELOG.md index 4210a24e..8c8605e9 100644 --- a/vendor/cookbooks/rails/CHANGELOG.md +++ b/vendor/cookbooks/rails/CHANGELOG.md @@ -1,12 +1,2 @@ -# CHANGELOG for rails - -This file is used to list changes made in each version of rails. - -## 0.1.0: - -* Initial release of rails - -- - - -Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown. - -The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown. +See https://github.com/intercity/chef-repo/blob/master/CHANGELOG.md for full +changelog diff --git a/vendor/cookbooks/rails/libraries/default.rb b/vendor/cookbooks/rails/libraries/default.rb new file mode 100644 index 00000000..584a73c4 --- /dev/null +++ b/vendor/cookbooks/rails/libraries/default.rb @@ -0,0 +1,20 @@ +module Rails + module Helpers + ## + # Create a default set of custom config + # Assure we always send certain hash keys to the template + def nginx_custom_configuration(app_info) + empty_conf = { + "before" => "", + "server_main" => "", + "server_app" => "", + "server_ssl" => "", + "server_ssl_app" => "", + "upstream" => "", + "after" => "", + } + + empty_conf.merge(app_info["nginx_custom"] || {}) + end + end +end diff --git a/vendor/cookbooks/rails/metadata.rb b/vendor/cookbooks/rails/metadata.rb index a907039f..0861f516 100644 --- a/vendor/cookbooks/rails/metadata.rb +++ b/vendor/cookbooks/rails/metadata.rb @@ -1,6 +1,7 @@ +name "rails" maintainer "Michiel Sikkes" maintainer_email "michiel@firmhouse.com" -license "Apache 2.0" +license "MIT" description "Installs/Configures rails" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version "0.1.0" @@ -8,4 +9,4 @@ depends "database" depends "nginx" depends "bluepill" -depends "logrotate" \ No newline at end of file +depends "logrotate" diff --git a/vendor/cookbooks/rails/recipes/default.rb b/vendor/cookbooks/rails/recipes/default.rb index 3b31ceb3..8c1022a2 100644 --- a/vendor/cookbooks/rails/recipes/default.rb +++ b/vendor/cookbooks/rails/recipes/default.rb @@ -4,18 +4,23 @@ # # Copyright 2012, Michiel Sikkes # -# 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. -# +# 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. include_recipe "sudo" include_recipe "nginx" @@ -26,6 +31,9 @@ if node[:active_applications] + # Include library helpers + ::Chef::Resource.send(:include, Rails::Helpers) + node[:active_applications].each do |app, app_info| rails_env = app_info['rails_env'] || "production" deploy_user = app_info['deploy_user'] || "deploy" @@ -105,8 +113,13 @@ template "/etc/nginx/sites-available/#{app}.conf" do source "app_nginx.conf.erb" - variables :name => app, :domain_names => app_info['domain_names'], :enable_ssl => File.exists?("#{applications_root}/#{app}/shared/config/certificate.crt") - notifies :reload, resources(:service => "nginx") + variables( + name: app, + domain_names: app_info["domain_names"], + redirect_domain_names: app_info["redirect_domain_names"], + enable_ssl: File.exists?("#{applications_root}/#{app}/shared/config/certificate.crt"), + custom_configuration: nginx_custom_configuration(app_info)) + notifies :reload, resources(service: "nginx") end template "#{applications_root}/#{app}/shared/config/unicorn.rb" do diff --git a/vendor/cookbooks/rails/recipes/passenger.rb b/vendor/cookbooks/rails/recipes/passenger.rb index c269d047..aab970b6 100644 --- a/vendor/cookbooks/rails/recipes/passenger.rb +++ b/vendor/cookbooks/rails/recipes/passenger.rb @@ -4,18 +4,23 @@ # # Copyright 2012, Michiel Sikkes # -# 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. -# +# 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. package "apt-transport-https" @@ -43,6 +48,9 @@ if node[:active_applications] + # Include library helpers + ::Chef::Resource.send(:include, Rails::Helpers) + node[:active_applications].each do |app, app_info| rails_env = app_info['rails_env'] || "production" deploy_user = app_info['deploy_user'] || "deploy" @@ -121,7 +129,12 @@ template "/etc/nginx/sites-available/#{app}.conf" do source "app_passenger_nginx.conf.erb" - variables :name => app, :rails_env => rails_env, :domain_names => app_info['domain_names'], :enable_ssl => File.exists?("#{applications_root}/#{app}/shared/config/certificate.crt") + variables( + name: app, + rails_env: rails_env, + domain_names: app_info["domain_names"], + enable_ssl: File.exists?("#{applications_root}/#{app}/shared/config/certificate.crt"), + custom_configuration: nginx_custom_configuration(app_info)) notifies :reload, resources(:service => "nginx") end diff --git a/vendor/cookbooks/rails/templates/default/app_nginx.conf.erb b/vendor/cookbooks/rails/templates/default/app_nginx.conf.erb index e18c59b3..9629be6e 100644 --- a/vendor/cookbooks/rails/templates/default/app_nginx.conf.erb +++ b/vendor/cookbooks/rails/templates/default/app_nginx.conf.erb @@ -1,3 +1,16 @@ +<%= @custom_configuration["before"] %> + +<% if @redirect_domain_names && @redirect_domain_names.any? %> +server { + listen <%= node['nginx']['port'] || '80' %>; + <% if @enable_ssl %> + listen 443 ssl; + <% end %> + server_name <%= @redirect_domain_names.join(' ') %>; + return 301 $scheme://<%= @domain_names.first %>$request_uri; +} +<% end %> + server { listen <%= node['nginx']['port'] || '80' %>; server_name <%= @domain_names.join(' ') %>; @@ -11,8 +24,9 @@ server { proxy_redirect off; proxy_pass http://<%= @name %>; + <%= @custom_configuration["server_app"] %> } - + <%= @custom_configuration["server_main"] %> } <% if @enable_ssl %> @@ -38,12 +52,16 @@ server { proxy_redirect off; proxy_pass http://<%= @name %>; + <%= @custom_configuration["ssl_app"] %> } - + <%= @custom_configuration["ssl_main"] %> } <% end %> upstream <%= @name %> { server unix:<%= node['rails']['applications_root'] %>/<%= @name %>/shared/tmp/sockets/unicorn.sock; + <%= @custom_configuration["upstream"] %> } + +<%= @custom_configuration["after"] %> diff --git a/vendor/cookbooks/rails/templates/default/app_passenger_nginx.conf.erb b/vendor/cookbooks/rails/templates/default/app_passenger_nginx.conf.erb index 851459a5..733615c7 100644 --- a/vendor/cookbooks/rails/templates/default/app_passenger_nginx.conf.erb +++ b/vendor/cookbooks/rails/templates/default/app_passenger_nginx.conf.erb @@ -1,3 +1,5 @@ +<%= @custom_configuration["before"] %> + server { listen <%= node['nginx']['port'] || '80' %>; server_name <%= @domain_names.join(' ') %>; @@ -5,7 +7,7 @@ server { passenger_enabled on; passenger_app_env <%= @rails_env %>; - + <%= @custom_configuration["server_main"] %> } <% if @enable_ssl %> @@ -22,7 +24,9 @@ server { server_name <%= @domain_names.join(' ') %>; root <%= node['rails']['applications_root'] %>/<%= @name %>/current/public; - + <%= @custom_configuration["ssl_main"] %> } -<% end %> \ No newline at end of file +<% end %> + +<%= @custom_configuration["after"] %> diff --git a/vendor/cookbooks/ssh_deploy_keys/CHANGELOG.md b/vendor/cookbooks/ssh_deploy_keys/CHANGELOG.md index a9f67746..8c8605e9 100644 --- a/vendor/cookbooks/ssh_deploy_keys/CHANGELOG.md +++ b/vendor/cookbooks/ssh_deploy_keys/CHANGELOG.md @@ -1,12 +1,2 @@ -# CHANGELOG for ssh_deploy_keys - -This file is used to list changes made in each version of ssh_deploy_keys. - -## 0.1.0: - -* Initial release of ssh_deploy_keys - -- - - -Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown. - -The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown. +See https://github.com/intercity/chef-repo/blob/master/CHANGELOG.md for full +changelog diff --git a/vendor/cookbooks/ssh_deploy_keys/metadata.rb b/vendor/cookbooks/ssh_deploy_keys/metadata.rb index 3a24d512..bdbe5248 100644 --- a/vendor/cookbooks/ssh_deploy_keys/metadata.rb +++ b/vendor/cookbooks/ssh_deploy_keys/metadata.rb @@ -1,6 +1,7 @@ +name "ssh_deploy_keys" maintainer "Michiel Sikkes" maintainer_email "michiel@firmhouse.com" -license "Apache 2.0" +license "MIT" description "Installs/Configures ssh_deploy_keys" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version "0.1.0" diff --git a/vendor/cookbooks/ssh_deploy_keys/recipes/default.rb b/vendor/cookbooks/ssh_deploy_keys/recipes/default.rb index 7a4b3b5f..0da94834 100644 --- a/vendor/cookbooks/ssh_deploy_keys/recipes/default.rb +++ b/vendor/cookbooks/ssh_deploy_keys/recipes/default.rb @@ -4,18 +4,23 @@ # # Copyright 2012, Michiel Sikkes # -# 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. -# +# 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. if node[:deploy_users] && node[:ssh_deploy_keys] node[:deploy_users].each do |deploy_user| @@ -33,4 +38,4 @@ variables :keys => node[:ssh_deploy_keys] end end -end \ No newline at end of file +end diff --git a/vendor/cookbooks/sysadmins/CHANGELOG.md b/vendor/cookbooks/sysadmins/CHANGELOG.md index ce84d97f..8c8605e9 100644 --- a/vendor/cookbooks/sysadmins/CHANGELOG.md +++ b/vendor/cookbooks/sysadmins/CHANGELOG.md @@ -1,8 +1,2 @@ -sysadmins CHANGELOG -=================== - -This file is used to list changes made in each version of the sysadmins cookbook. - -0.1.0 ------ -- [Bèr Kessels] - Initial release of sysadmins +See https://github.com/intercity/chef-repo/blob/master/CHANGELOG.md for full +changelog diff --git a/vendor/cookbooks/sysadmins/recipes/default.rb b/vendor/cookbooks/sysadmins/recipes/default.rb index 802daf59..8c7a5938 100644 --- a/vendor/cookbooks/sysadmins/recipes/default.rb +++ b/vendor/cookbooks/sysadmins/recipes/default.rb @@ -4,17 +4,23 @@ # # Copyright 2014, Bèr `berkes` Kessels # -# 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. +# 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. node[:sysadmins].each do |username, user| home_dir = "/home/#{username}"