Skip to content

Commit

Permalink
adds: restructure of repo for 5.0.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
TalkingQuickly committed Mar 18, 2021
1 parent deec041 commit fb1480e
Show file tree
Hide file tree
Showing 52 changed files with 188 additions and 63 deletions.
9 changes: 3 additions & 6 deletions Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
12 changes: 9 additions & 3 deletions Berksfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 20 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion roles/nginx-server.json
Original file line number Diff line number Diff line change
Expand Up @@ -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]"
],
Expand Down
4 changes: 2 additions & 2 deletions roles/postgres-server.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion roles/rails-app.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion roles/server.json
Original file line number Diff line number Diff line change
Expand Up @@ -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]",
Expand Down
3 changes: 0 additions & 3 deletions site-cookbooks/nginx_wrapper/LICENSE

This file was deleted.

3 changes: 0 additions & 3 deletions site-cookbooks/postgresql_wrapper/LICENSE

This file was deleted.

21 changes: 19 additions & 2 deletions site-cookbooks/rdr_memcached_wrapper/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
File renamed without changes.
File renamed without changes.
20 changes: 20 additions & 0 deletions site-cookbooks/rdr_nginx_wrapper/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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: '.'
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name 'nginx_wrapper'
name 'rdr_nginx_wrapper'
maintainer 'Ben Dixon'
maintainer_email '[email protected]'
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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 20 additions & 0 deletions site-cookbooks/rdr_postgresql_wrapper/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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: '.'
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name 'postgresql_wrapper'
name 'rdr_postgresql_wrapper'
maintainer 'Ben Dixon'
maintainer_email '[email protected]'
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'
Expand Down
21 changes: 19 additions & 2 deletions site-cookbooks/rdr_redisio_wrapper/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
8 changes: 4 additions & 4 deletions site-cookbooks/rdr_redisio_wrapper/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name 'rdr_redisio_wrapper'
maintainer 'The Authors'
maintainer_email '[email protected]'
license 'All Rights Reserved'
description 'Installs/Configures rdr_redisio_wrapper'
maintainer 'Ben Dixon'
maintainer_email '[email protected]'
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'
Expand Down
20 changes: 20 additions & 0 deletions site-cookbooks/rdr_ruby_rbenv_wrapper/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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: '.'
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name 'ruby_rbenv_wrapper'
maintainer 'The Authors'
maintainer_email '[email protected]'
license 'All Rights Reserved'
description 'Installs/Configures ruby_rbenv_wrapper'
name 'rdr_ruby_rbenv_wrapper'
maintainer 'Ben Dixon'
maintainer_email '[email protected]'
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'
Expand Down
File renamed without changes.
File renamed without changes.
20 changes: 20 additions & 0 deletions site-cookbooks/rdr_users_wrapper/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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: '.'
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name 'users_wrapper'
maintainer 'The Authors'
maintainer_email '[email protected]'
license 'All Rights Reserved'
description 'Installs/Configures users_wrapper'
name 'rdr_users_wrapper'
maintainer 'Ben Dixon'
maintainer_email '[email protected]'
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'
Expand Down
3 changes: 0 additions & 3 deletions site-cookbooks/ruby_rbenv_wrapper/LICENSE

This file was deleted.

3 changes: 0 additions & 3 deletions site-cookbooks/users_wrapper/LICENSE

This file was deleted.

0 comments on commit fb1480e

Please sign in to comment.