diff --git a/Berksfile b/Berksfile index 53d6262..b225dc7 100644 --- a/Berksfile +++ b/Berksfile @@ -36,10 +36,7 @@ cookbook 'users', '~> 5.5.0' cookbook 'ruby_build', '~> 2.1.1' cookbook 'ruby_rbenv', github: 'sous-chefs/ruby_rbenv' -# cookbook 'rails_gem_dependencies-tlq', github: 'TalkingQuickly/rails_gem_dependencies-tlq' -cookbook 'rails_gem_dependencies-tlq', path: '../rails_gem_dependencies-tlq' +cookbook 'rails_gem_dependencies-tlq', github: 'TalkingQuickly/rails_gem_dependencies-tlq', tag: '1.0.0' cookbook 'redisio', '~> 4.2.0' -# cookbook 'monit-tlq', github: 'TalkingQuickly/monit-tlq', branch: 'master' -cookbook 'monit-tlq', path: '../monit-tlq' -# cookbook 'monit_configs-tlq', github: 'TalkingQuickly/monit_configs-tlq', branch: 'master' -cookbook 'monit_configs-tlq', path: '../monit_configs-tlq' +cookbook 'monit-tlq', github: 'TalkingQuickly/monit-tlq', tag: '0.5.0' +cookbook 'monit_configs-tlq', github: 'TalkingQuickly/monit_configs-tlq', tag: '1.0.0' diff --git a/Berksfile.lock b/Berksfile.lock index 4eec357..2f51d78 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -6,16 +6,22 @@ DEPENDENCIES locale (~> 1.1.0) memcached (~> 6.1.0) monit-tlq - path: ../monit-tlq + git: https://github.com/TalkingQuickly/monit-tlq.git + revision: 0716844d44766f302d9185b0e76fb4e2e162ce85 + tag: 0.5.0 monit_configs-tlq - path: ../monit_configs-tlq + git: https://github.com/TalkingQuickly/monit_configs-tlq.git + revision: 2bf25564c623514d2d56c8518f6334d14914073a + tag: 1.0.0 mysql (~> 5.6.3) nginx (~> 11.4.0) ntp (~> 3.7.0) openssh (= 1.2.2) postgresql (~> 8.2.1) rails_gem_dependencies-tlq - path: ../rails_gem_dependencies-tlq + git: https://github.com/TalkingQuickly/rails_gem_dependencies-tlq.git + revision: 9592bdf890810ded3752879c6ac1e6111e669304 + tag: 1.0.0 redisio (~> 4.2.0) ruby_build (~> 2.1.1) ruby_rbenv diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ca6686a --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +Copyright 2021 Ben Dixon + +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. \ No newline at end of file diff --git a/roles/nginx-server.json b/roles/nginx-server.json index 2829530..6ef6633 100644 --- a/roles/nginx-server.json +++ b/roles/nginx-server.json @@ -14,7 +14,7 @@ "json_class": "Chef::Role", "run_list": [ "role[server]", - "recipe[nginx_wrapper::default]", + "recipe[rdr_nginx_wrapper::default]", "recipe[monit_configs-tlq::nginx]", "recipe[ufw::default]" ], diff --git a/roles/postgres-server.json b/roles/postgres-server.json index 3c861ca..40ead73 100644 --- a/roles/postgres-server.json +++ b/roles/postgres-server.json @@ -9,8 +9,8 @@ "json_class": "Chef::Role", "run_list": [ "role[server]", - "postgresql_wrapper::default", - "monit_configs-tlq::postgres" + "recipe[rdr_postgresql_wrapper::default]", + "recipe[monit_configs-tlq::postgres]" ], "chef_type": "role" } diff --git a/roles/rails-app.json b/roles/rails-app.json index a41d4d6..d24f487 100644 --- a/roles/rails-app.json +++ b/roles/rails-app.json @@ -18,7 +18,7 @@ "json_class": "Chef::Role", "run_list": [ "recipe[rails_gem_dependencies-tlq::default]", - "recipe[ruby_rbenv_wrapper::default]" + "recipe[rdr_ruby_rbenv_wrapper::default]" ], "chef_type": "role", "override_attributes": { diff --git a/roles/server.json b/roles/server.json index 881aa98..cf583b7 100644 --- a/roles/server.json +++ b/roles/server.json @@ -51,7 +51,7 @@ "json_class": "Chef::Role", "run_list": [ "recipe[apt::default]", - "recipe[users_wrapper::default]", + "recipe[rdr_users_wrapper::default]", "recipe[firewall::default]", "recipe[ufw::default]", "recipe[apt::unattended-upgrades]", diff --git a/site-cookbooks/nginx_wrapper/LICENSE b/site-cookbooks/nginx_wrapper/LICENSE deleted file mode 100644 index d6ba5ac..0000000 --- a/site-cookbooks/nginx_wrapper/LICENSE +++ /dev/null @@ -1,3 +0,0 @@ -Copyright 2020 The Authors - -All rights reserved, do not redistribute. diff --git a/site-cookbooks/postgresql_wrapper/LICENSE b/site-cookbooks/postgresql_wrapper/LICENSE deleted file mode 100644 index d6ba5ac..0000000 --- a/site-cookbooks/postgresql_wrapper/LICENSE +++ /dev/null @@ -1,3 +0,0 @@ -Copyright 2020 The Authors - -All rights reserved, do not redistribute. diff --git a/site-cookbooks/rdr_memcached_wrapper/LICENSE b/site-cookbooks/rdr_memcached_wrapper/LICENSE index 080dee9..ca6686a 100644 --- a/site-cookbooks/rdr_memcached_wrapper/LICENSE +++ b/site-cookbooks/rdr_memcached_wrapper/LICENSE @@ -1,3 +1,20 @@ -Copyright 2021 The Authors +Copyright 2021 Ben Dixon -All rights reserved, do not redistribute. +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. \ No newline at end of file diff --git a/site-cookbooks/nginx_wrapper/.delivery/project.toml b/site-cookbooks/rdr_nginx_wrapper/.delivery/project.toml similarity index 100% rename from site-cookbooks/nginx_wrapper/.delivery/project.toml rename to site-cookbooks/rdr_nginx_wrapper/.delivery/project.toml diff --git a/site-cookbooks/nginx_wrapper/.gitignore b/site-cookbooks/rdr_nginx_wrapper/.gitignore similarity index 100% rename from site-cookbooks/nginx_wrapper/.gitignore rename to site-cookbooks/rdr_nginx_wrapper/.gitignore diff --git a/site-cookbooks/nginx_wrapper/CHANGELOG.md b/site-cookbooks/rdr_nginx_wrapper/CHANGELOG.md similarity index 100% rename from site-cookbooks/nginx_wrapper/CHANGELOG.md rename to site-cookbooks/rdr_nginx_wrapper/CHANGELOG.md diff --git a/site-cookbooks/rdr_nginx_wrapper/LICENSE b/site-cookbooks/rdr_nginx_wrapper/LICENSE new file mode 100644 index 0000000..ca6686a --- /dev/null +++ b/site-cookbooks/rdr_nginx_wrapper/LICENSE @@ -0,0 +1,20 @@ +Copyright 2021 Ben Dixon + +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. \ No newline at end of file diff --git a/site-cookbooks/nginx_wrapper/Policyfile.rb b/site-cookbooks/rdr_nginx_wrapper/Policyfile.rb similarity index 80% rename from site-cookbooks/nginx_wrapper/Policyfile.rb rename to site-cookbooks/rdr_nginx_wrapper/Policyfile.rb index c2c93df..ba68fea 100644 --- a/site-cookbooks/nginx_wrapper/Policyfile.rb +++ b/site-cookbooks/rdr_nginx_wrapper/Policyfile.rb @@ -4,13 +4,13 @@ # https://docs.chef.io/policyfile/ # A name that describes what the system you're building with Chef does. -name 'nginx_wrapper' +name 'rdr_nginx_wrapper' # Where to find external cookbooks: default_source :supermarket # run_list: chef-client will run these recipes in the order specified. -run_list 'nginx_wrapper::default' +run_list 'rdr_nginx_wrapper::default' # Specify a custom source for a single cookbook: -cookbook 'nginx_wrapper', path: '.' +cookbook 'rdr_nginx_wrapper', path: '.' diff --git a/site-cookbooks/nginx_wrapper/README.md b/site-cookbooks/rdr_nginx_wrapper/README.md similarity index 100% rename from site-cookbooks/nginx_wrapper/README.md rename to site-cookbooks/rdr_nginx_wrapper/README.md diff --git a/site-cookbooks/nginx_wrapper/chefignore b/site-cookbooks/rdr_nginx_wrapper/chefignore similarity index 100% rename from site-cookbooks/nginx_wrapper/chefignore rename to site-cookbooks/rdr_nginx_wrapper/chefignore diff --git a/site-cookbooks/nginx_wrapper/metadata.rb b/site-cookbooks/rdr_nginx_wrapper/metadata.rb similarity index 84% rename from site-cookbooks/nginx_wrapper/metadata.rb rename to site-cookbooks/rdr_nginx_wrapper/metadata.rb index 90f73e5..0c4429b 100644 --- a/site-cookbooks/nginx_wrapper/metadata.rb +++ b/site-cookbooks/rdr_nginx_wrapper/metadata.rb @@ -1,8 +1,8 @@ -name 'nginx_wrapper' +name 'rdr_nginx_wrapper' maintainer 'Ben Dixon' maintainer_email 'ben@talkingquickly.co.uk' -license 'All Rights Reserved' -description 'Minimal wrapper around Nginx' +license 'MIT License' +description 'A lightweight wrapper around the community Nginx Cookbook' version '0.1.0' chef_version '>= 15.0' depends 'nginx' diff --git a/site-cookbooks/nginx_wrapper/recipes/default.rb b/site-cookbooks/rdr_nginx_wrapper/recipes/default.rb similarity index 93% rename from site-cookbooks/nginx_wrapper/recipes/default.rb rename to site-cookbooks/rdr_nginx_wrapper/recipes/default.rb index a914639..f993f75 100644 --- a/site-cookbooks/nginx_wrapper/recipes/default.rb +++ b/site-cookbooks/rdr_nginx_wrapper/recipes/default.rb @@ -16,7 +16,7 @@ nginx_config 'nginx' do action :create - conf_cookbook 'nginx_wrapper' + conf_cookbook 'rdr_nginx_wrapper' conf_template 'nginx.conf.erb' default_site_enabled true notifies :reload, 'nginx_service[nginx]', :delayed diff --git a/site-cookbooks/nginx_wrapper/templates/nginx.conf.erb b/site-cookbooks/rdr_nginx_wrapper/templates/nginx.conf.erb similarity index 100% rename from site-cookbooks/nginx_wrapper/templates/nginx.conf.erb rename to site-cookbooks/rdr_nginx_wrapper/templates/nginx.conf.erb diff --git a/site-cookbooks/postgresql_wrapper/.delivery/project.toml b/site-cookbooks/rdr_postgresql_wrapper/.delivery/project.toml similarity index 100% rename from site-cookbooks/postgresql_wrapper/.delivery/project.toml rename to site-cookbooks/rdr_postgresql_wrapper/.delivery/project.toml diff --git a/site-cookbooks/postgresql_wrapper/.gitignore b/site-cookbooks/rdr_postgresql_wrapper/.gitignore similarity index 100% rename from site-cookbooks/postgresql_wrapper/.gitignore rename to site-cookbooks/rdr_postgresql_wrapper/.gitignore diff --git a/site-cookbooks/postgresql_wrapper/CHANGELOG.md b/site-cookbooks/rdr_postgresql_wrapper/CHANGELOG.md similarity index 100% rename from site-cookbooks/postgresql_wrapper/CHANGELOG.md rename to site-cookbooks/rdr_postgresql_wrapper/CHANGELOG.md diff --git a/site-cookbooks/rdr_postgresql_wrapper/LICENSE b/site-cookbooks/rdr_postgresql_wrapper/LICENSE new file mode 100644 index 0000000..ca6686a --- /dev/null +++ b/site-cookbooks/rdr_postgresql_wrapper/LICENSE @@ -0,0 +1,20 @@ +Copyright 2021 Ben Dixon + +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. \ No newline at end of file diff --git a/site-cookbooks/postgresql_wrapper/Policyfile.rb b/site-cookbooks/rdr_postgresql_wrapper/Policyfile.rb similarity index 78% rename from site-cookbooks/postgresql_wrapper/Policyfile.rb rename to site-cookbooks/rdr_postgresql_wrapper/Policyfile.rb index cd1cdb2..8840758 100644 --- a/site-cookbooks/postgresql_wrapper/Policyfile.rb +++ b/site-cookbooks/rdr_postgresql_wrapper/Policyfile.rb @@ -4,13 +4,13 @@ # https://docs.chef.io/policyfile/ # A name that describes what the system you're building with Chef does. -name 'postgresql_wrapper' +name 'rdr_postgresql_wrapper' # Where to find external cookbooks: default_source :supermarket # run_list: chef-client will run these recipes in the order specified. -run_list 'postgresql_wrapper::default' +run_list 'rdr_postgresql_wrapper::default' # Specify a custom source for a single cookbook: -cookbook 'postgresql_wrapper', path: '.' +cookbook 'rdr_postgresql_wrapper', path: '.' diff --git a/site-cookbooks/postgresql_wrapper/README.md b/site-cookbooks/rdr_postgresql_wrapper/README.md similarity index 100% rename from site-cookbooks/postgresql_wrapper/README.md rename to site-cookbooks/rdr_postgresql_wrapper/README.md diff --git a/site-cookbooks/postgresql_wrapper/chefignore b/site-cookbooks/rdr_postgresql_wrapper/chefignore similarity index 100% rename from site-cookbooks/postgresql_wrapper/chefignore rename to site-cookbooks/rdr_postgresql_wrapper/chefignore diff --git a/site-cookbooks/postgresql_wrapper/metadata.rb b/site-cookbooks/rdr_postgresql_wrapper/metadata.rb similarity index 83% rename from site-cookbooks/postgresql_wrapper/metadata.rb rename to site-cookbooks/rdr_postgresql_wrapper/metadata.rb index bd3f6fe..bbbe0f9 100644 --- a/site-cookbooks/postgresql_wrapper/metadata.rb +++ b/site-cookbooks/rdr_postgresql_wrapper/metadata.rb @@ -1,8 +1,8 @@ -name 'postgresql_wrapper' +name 'rdr_postgresql_wrapper' maintainer 'Ben Dixon' maintainer_email 'ben@talkingquickly.co.uk' -license 'All Rights Reserved' -description 'Installs/Configures postgresql_wrapper' +license 'MIT License' +description 'Installs PostgreSQL Client, Server and Development Headers' version '0.1.0' chef_version '>= 15.0' depends 'postgresql' diff --git a/site-cookbooks/postgresql_wrapper/recipes/default.rb b/site-cookbooks/rdr_postgresql_wrapper/recipes/default.rb similarity index 100% rename from site-cookbooks/postgresql_wrapper/recipes/default.rb rename to site-cookbooks/rdr_postgresql_wrapper/recipes/default.rb diff --git a/site-cookbooks/rdr_redisio_wrapper/LICENSE b/site-cookbooks/rdr_redisio_wrapper/LICENSE index 080dee9..ca6686a 100644 --- a/site-cookbooks/rdr_redisio_wrapper/LICENSE +++ b/site-cookbooks/rdr_redisio_wrapper/LICENSE @@ -1,3 +1,20 @@ -Copyright 2021 The Authors +Copyright 2021 Ben Dixon -All rights reserved, do not redistribute. +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. \ No newline at end of file diff --git a/site-cookbooks/rdr_redisio_wrapper/metadata.rb b/site-cookbooks/rdr_redisio_wrapper/metadata.rb index 9884948..191b85c 100644 --- a/site-cookbooks/rdr_redisio_wrapper/metadata.rb +++ b/site-cookbooks/rdr_redisio_wrapper/metadata.rb @@ -1,8 +1,8 @@ name 'rdr_redisio_wrapper' -maintainer 'The Authors' -maintainer_email 'you@example.com' -license 'All Rights Reserved' -description 'Installs/Configures rdr_redisio_wrapper' +maintainer 'Ben Dixon' +maintainer_email 'ben@talkingquickly.co.uk' +license 'MIT License' +description 'A lightweight wrapper around the community redisio LWRP\'s for installing Redis server' version '0.1.0' chef_version '>= 15.0' depends 'redisio' diff --git a/site-cookbooks/ruby_rbenv_wrapper/.delivery/project.toml b/site-cookbooks/rdr_ruby_rbenv_wrapper/.delivery/project.toml similarity index 100% rename from site-cookbooks/ruby_rbenv_wrapper/.delivery/project.toml rename to site-cookbooks/rdr_ruby_rbenv_wrapper/.delivery/project.toml diff --git a/site-cookbooks/ruby_rbenv_wrapper/.gitignore b/site-cookbooks/rdr_ruby_rbenv_wrapper/.gitignore similarity index 100% rename from site-cookbooks/ruby_rbenv_wrapper/.gitignore rename to site-cookbooks/rdr_ruby_rbenv_wrapper/.gitignore diff --git a/site-cookbooks/ruby_rbenv_wrapper/CHANGELOG.md b/site-cookbooks/rdr_ruby_rbenv_wrapper/CHANGELOG.md similarity index 100% rename from site-cookbooks/ruby_rbenv_wrapper/CHANGELOG.md rename to site-cookbooks/rdr_ruby_rbenv_wrapper/CHANGELOG.md diff --git a/site-cookbooks/rdr_ruby_rbenv_wrapper/LICENSE b/site-cookbooks/rdr_ruby_rbenv_wrapper/LICENSE new file mode 100644 index 0000000..ca6686a --- /dev/null +++ b/site-cookbooks/rdr_ruby_rbenv_wrapper/LICENSE @@ -0,0 +1,20 @@ +Copyright 2021 Ben Dixon + +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. \ No newline at end of file diff --git a/site-cookbooks/ruby_rbenv_wrapper/Policyfile.rb b/site-cookbooks/rdr_ruby_rbenv_wrapper/Policyfile.rb similarity index 78% rename from site-cookbooks/ruby_rbenv_wrapper/Policyfile.rb rename to site-cookbooks/rdr_ruby_rbenv_wrapper/Policyfile.rb index 947354d..997aafa 100644 --- a/site-cookbooks/ruby_rbenv_wrapper/Policyfile.rb +++ b/site-cookbooks/rdr_ruby_rbenv_wrapper/Policyfile.rb @@ -4,13 +4,13 @@ # https://docs.chef.io/policyfile/ # A name that describes what the system you're building with Chef does. -name 'ruby_rbenv_wrapper' +name 'rdr_ruby_rbenv_wrapper' # Where to find external cookbooks: default_source :supermarket # run_list: chef-client will run these recipes in the order specified. -run_list 'ruby_rbenv_wrapper::default' +run_list 'rdr_ruby_rbenv_wrapper::default' # Specify a custom source for a single cookbook: -cookbook 'ruby_rbenv_wrapper', path: '.' +cookbook 'rdr_ruby_rbenv_wrapper', path: '.' diff --git a/site-cookbooks/ruby_rbenv_wrapper/README.md b/site-cookbooks/rdr_ruby_rbenv_wrapper/README.md similarity index 100% rename from site-cookbooks/ruby_rbenv_wrapper/README.md rename to site-cookbooks/rdr_ruby_rbenv_wrapper/README.md diff --git a/site-cookbooks/ruby_rbenv_wrapper/chefignore b/site-cookbooks/rdr_ruby_rbenv_wrapper/chefignore similarity index 100% rename from site-cookbooks/ruby_rbenv_wrapper/chefignore rename to site-cookbooks/rdr_ruby_rbenv_wrapper/chefignore diff --git a/site-cookbooks/ruby_rbenv_wrapper/metadata.rb b/site-cookbooks/rdr_ruby_rbenv_wrapper/metadata.rb similarity index 73% rename from site-cookbooks/ruby_rbenv_wrapper/metadata.rb rename to site-cookbooks/rdr_ruby_rbenv_wrapper/metadata.rb index 02f979e..a8ae776 100644 --- a/site-cookbooks/ruby_rbenv_wrapper/metadata.rb +++ b/site-cookbooks/rdr_ruby_rbenv_wrapper/metadata.rb @@ -1,8 +1,8 @@ -name 'ruby_rbenv_wrapper' -maintainer 'The Authors' -maintainer_email 'you@example.com' -license 'All Rights Reserved' -description 'Installs/Configures ruby_rbenv_wrapper' +name 'rdr_ruby_rbenv_wrapper' +maintainer 'Ben Dixon' +maintainer_email 'ben@talkingquickly.co.uk' +license 'MIT License' +description 'Installs/Configures RBenv and one or more ruby versions + default gems' version '0.1.0' chef_version '>= 15.0' depends 'ruby_rbenv' diff --git a/site-cookbooks/ruby_rbenv_wrapper/recipes/default.rb b/site-cookbooks/rdr_ruby_rbenv_wrapper/recipes/default.rb similarity index 100% rename from site-cookbooks/ruby_rbenv_wrapper/recipes/default.rb rename to site-cookbooks/rdr_ruby_rbenv_wrapper/recipes/default.rb diff --git a/site-cookbooks/users_wrapper/.delivery/project.toml b/site-cookbooks/rdr_users_wrapper/.delivery/project.toml similarity index 100% rename from site-cookbooks/users_wrapper/.delivery/project.toml rename to site-cookbooks/rdr_users_wrapper/.delivery/project.toml diff --git a/site-cookbooks/users_wrapper/.gitignore b/site-cookbooks/rdr_users_wrapper/.gitignore similarity index 100% rename from site-cookbooks/users_wrapper/.gitignore rename to site-cookbooks/rdr_users_wrapper/.gitignore diff --git a/site-cookbooks/users_wrapper/CHANGELOG.md b/site-cookbooks/rdr_users_wrapper/CHANGELOG.md similarity index 100% rename from site-cookbooks/users_wrapper/CHANGELOG.md rename to site-cookbooks/rdr_users_wrapper/CHANGELOG.md diff --git a/site-cookbooks/rdr_users_wrapper/LICENSE b/site-cookbooks/rdr_users_wrapper/LICENSE new file mode 100644 index 0000000..ca6686a --- /dev/null +++ b/site-cookbooks/rdr_users_wrapper/LICENSE @@ -0,0 +1,20 @@ +Copyright 2021 Ben Dixon + +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. \ No newline at end of file diff --git a/site-cookbooks/users_wrapper/Policyfile.rb b/site-cookbooks/rdr_users_wrapper/Policyfile.rb similarity index 80% rename from site-cookbooks/users_wrapper/Policyfile.rb rename to site-cookbooks/rdr_users_wrapper/Policyfile.rb index 6253c68..c2be641 100644 --- a/site-cookbooks/users_wrapper/Policyfile.rb +++ b/site-cookbooks/rdr_users_wrapper/Policyfile.rb @@ -4,13 +4,13 @@ # https://docs.chef.io/policyfile/ # A name that describes what the system you're building with Chef does. -name 'users_wrapper' +name 'rdr_users_wrapper' # Where to find external cookbooks: default_source :supermarket # run_list: chef-client will run these recipes in the order specified. -run_list 'users_wrapper::default' +run_list 'rdr_users_wrapper::default' # Specify a custom source for a single cookbook: -cookbook 'users_wrapper', path: '.' +cookbook 'rdr_users_wrapper', path: '.' diff --git a/site-cookbooks/users_wrapper/README.md b/site-cookbooks/rdr_users_wrapper/README.md similarity index 100% rename from site-cookbooks/users_wrapper/README.md rename to site-cookbooks/rdr_users_wrapper/README.md diff --git a/site-cookbooks/users_wrapper/chefignore b/site-cookbooks/rdr_users_wrapper/chefignore similarity index 100% rename from site-cookbooks/users_wrapper/chefignore rename to site-cookbooks/rdr_users_wrapper/chefignore diff --git a/site-cookbooks/users_wrapper/kitchen.yml b/site-cookbooks/rdr_users_wrapper/kitchen.yml similarity index 100% rename from site-cookbooks/users_wrapper/kitchen.yml rename to site-cookbooks/rdr_users_wrapper/kitchen.yml diff --git a/site-cookbooks/users_wrapper/metadata.rb b/site-cookbooks/rdr_users_wrapper/metadata.rb similarity index 69% rename from site-cookbooks/users_wrapper/metadata.rb rename to site-cookbooks/rdr_users_wrapper/metadata.rb index 425fb07..147d7be 100644 --- a/site-cookbooks/users_wrapper/metadata.rb +++ b/site-cookbooks/rdr_users_wrapper/metadata.rb @@ -1,8 +1,8 @@ -name 'users_wrapper' -maintainer 'The Authors' -maintainer_email 'you@example.com' -license 'All Rights Reserved' -description 'Installs/Configures users_wrapper' +name 'rdr_users_wrapper' +maintainer 'Ben Dixon' +maintainer_email 'ben@talkingquickqly.co.uk' +license 'MIT License' +description 'Wrapper cookbook around; https://github.com/sous-chefs/users which will add the users defined in the users data bag' version '0.1.0' chef_version '>= 15.0' depends 'users' diff --git a/site-cookbooks/users_wrapper/recipes/default.rb b/site-cookbooks/rdr_users_wrapper/recipes/default.rb similarity index 100% rename from site-cookbooks/users_wrapper/recipes/default.rb rename to site-cookbooks/rdr_users_wrapper/recipes/default.rb diff --git a/site-cookbooks/ruby_rbenv_wrapper/LICENSE b/site-cookbooks/ruby_rbenv_wrapper/LICENSE deleted file mode 100644 index d6ba5ac..0000000 --- a/site-cookbooks/ruby_rbenv_wrapper/LICENSE +++ /dev/null @@ -1,3 +0,0 @@ -Copyright 2020 The Authors - -All rights reserved, do not redistribute. diff --git a/site-cookbooks/users_wrapper/LICENSE b/site-cookbooks/users_wrapper/LICENSE deleted file mode 100644 index d6ba5ac..0000000 --- a/site-cookbooks/users_wrapper/LICENSE +++ /dev/null @@ -1,3 +0,0 @@ -Copyright 2020 The Authors - -All rights reserved, do not redistribute.