Skip to content

Commit a7064ec

Browse files
adds: updated redis, memcache as well as all monitoring
1 parent 3424365 commit a7064ec

30 files changed

+512
-103
lines changed

Berksfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ cookbook 'hostnames', '= 0.3.1'
1111

1212
cookbook 'locale', '~> 1.1.0'
1313

14-
#cookbook 'memcached', github: 'opscode-cookbooks/memcached'
15-
cookbook 'memcached', '~> 3.0.0'
14+
cookbook 'memcached', '~> 6.1.0'
1615

1716
#cookbook 'mysql', github: 'opscode-cookbooks/mysql'
1817
cookbook 'mysql', '~> 5.6.3'
@@ -39,7 +38,8 @@ cookbook 'ruby_rbenv', github: 'sous-chefs/ruby_rbenv'
3938

4039
# cookbook 'rails_gem_dependencies-tlq', github: 'TalkingQuickly/rails_gem_dependencies-tlq'
4140
cookbook 'rails_gem_dependencies-tlq', path: '../rails_gem_dependencies-tlq'
42-
cookbook 'redis-server', github: 'TalkingQuickly/redis-server'
41+
cookbook 'redisio', '~> 4.2.0'
4342
# cookbook 'monit-tlq', github: 'TalkingQuickly/monit-tlq', branch: 'master'
4443
cookbook 'monit-tlq', path: '../monit-tlq'
45-
cookbook 'monit_configs-tlq', github: 'TalkingQuickly/monit_configs-tlq', branch: 'master'
44+
# cookbook 'monit_configs-tlq', github: 'TalkingQuickly/monit_configs-tlq', branch: 'master'
45+
cookbook 'monit_configs-tlq', path: '../monit_configs-tlq'

Berksfile.lock

+11-19
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,19 @@ DEPENDENCIES
44
firewall (~> 2.7.0)
55
hostnames (= 0.3.1)
66
locale (~> 1.1.0)
7-
memcached (~> 3.0.0)
7+
memcached (~> 6.1.0)
88
monit-tlq
99
path: ../monit-tlq
1010
monit_configs-tlq
11-
git: git://github.com/TalkingQuickly/monit_configs-tlq.git
12-
revision: c10ee522a69db1ec48672a2b1c8a42ae92e027e1
13-
branch: master
11+
path: ../monit_configs-tlq
1412
mysql (~> 5.6.3)
1513
nginx (~> 11.4.0)
1614
ntp (~> 3.7.0)
1715
openssh (= 1.2.2)
1816
postgresql (~> 8.2.1)
1917
rails_gem_dependencies-tlq
2018
path: ../rails_gem_dependencies-tlq
21-
redis-server
22-
git: git://github.com/TalkingQuickly/redis-server.git
23-
revision: a8cf2367505d543a0601db572b90ff30d693f202
19+
redisio (~> 4.2.0)
2420
ruby_build (~> 2.1.1)
2521
ruby_rbenv
2622
git: https://github.com/sous-chefs/ruby_rbenv.git
@@ -34,7 +30,6 @@ GRAPH
3430
apt-chef (1.0.0)
3531
apt (>= 0.0.0)
3632
chef-sugar (5.1.12)
37-
compat_resource (12.10.6)
3833
fail2ban (2.3.0)
3934
yum-epel (>= 0.0.0)
4035
firewall (2.7.0)
@@ -45,12 +40,9 @@ GRAPH
4540
hostsfile (2.4.5)
4641
iptables (2.2.0)
4742
locale (1.1.0)
48-
memcached (3.0.0)
49-
compat_resource (>= 12.9.0)
50-
runit (>= 1.2.0)
51-
yum-epel (>= 0.0.0)
52-
monit-tlq (0.4.0)
53-
monit_configs-tlq (0.1.2)
43+
memcached (6.1.0)
44+
monit-tlq (0.5.0)
45+
monit_configs-tlq (1.0.0)
5446
mysql (5.6.3)
5547
yum-mysql-community (>= 0.0.0)
5648
nginx (11.4.0)
@@ -59,24 +51,24 @@ GRAPH
5951
ohai (5.3.0)
6052
openssh (1.2.2)
6153
iptables (>= 0.0.0)
62-
packagecloud (0.2.3)
6354
postgresql (8.2.1)
6455
apt (>= 0.0.0)
6556
yum-epel (>= 0.0.0)
6657
rails_gem_dependencies-tlq (1.0.0)
6758
apt (>= 0.0.0)
68-
redis-server (0.1.1)
69-
apt (>= 0.0.0)
59+
redisio (4.2.0)
60+
selinux_policy (>= 2.2.0)
61+
ulimit (>= 0.1.2)
7062
ruby_build (2.1.1)
7163
homebrew (>= 0.0.0)
7264
yum-centos (>= 0.0.0)
7365
yum-epel (>= 0.0.0)
7466
ruby_rbenv (2.6.0)
75-
runit (1.7.8)
76-
packagecloud (>= 0.0.0)
67+
selinux_policy (2.4.3)
7768
sudo (2.9.0)
7869
ufw (3.2.1)
7970
firewall (>= 2.0)
71+
ulimit (1.1.1)
8072
users (5.5.0)
8173
yum (3.11.0)
8274
yum-centos (4.0.2)

knife.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
knife[:ssh_attribute] = "knife_zero.host"
66
knife[:use_sudo] = true
77
knife[:editor] = 'vim'
8-
knife[:before_bootstrap] = "berks vendor"
9-
knife[:before_converge] = "berks vendor"
8+
knife[:before_bootstrap] = "rm -rf ./berks-cookboks/* && berks vendor"
9+
knife[:before_converge] = "rm -rf ./berks-cookboks/* && berks vendor"

roles/memcached-server.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"json_class": "Chef::Role",
88
"run_list": [
99
"role[server]",
10-
"recipe[memcached::default]",
10+
"recipe[rdr_memcached_wrapper::default]",
1111
"recipe[monit_configs-tlq::memcached]"
1212
],
1313
"chef_type": "role"

roles/mongo-server.json

-32
This file was deleted.

roles/mysql-server.json

-29
This file was deleted.

roles/nginx-server.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nginx-server",
3-
"description": "Nginx server",
3+
"description": "An Nginx server",
44
"default_attributes": {
55
"firewall" : {
66
"rules" : [

roles/postgres-server.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "postgres-server",
3-
"description": "Postgres database server",
3+
"description": "A Postgres database server",
44
"default_attributes": {
55
"postgresql" : {
66
"version" : "13"

roles/rails-app.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "rails-app",
3-
"description": "Something which runs rails apps.",
3+
"description": "A server which will be running Ruby on Rails applications",
44
"default_attributes": {
55
"rbenv":{
66
"rubies": [
7-
"2.7.2"
7+
"3.0.0"
88
],
9-
"global" : "2.7.2",
9+
"global" : "3.0.0",
1010
"gems": {
11-
"2.7.2" : [
11+
"3.0.0" : [
1212
{"name":"bundler"}
1313
]
1414
}
@@ -17,8 +17,8 @@
1717
},
1818
"json_class": "Chef::Role",
1919
"run_list": [
20-
"rails_gem_dependencies-tlq",
21-
"ruby_rbenv_wrapper::default"
20+
"recipe[rails_gem_dependencies-tlq::default]",
21+
"recipe[ruby_rbenv_wrapper::default]"
2222
],
2323
"chef_type": "role",
2424
"override_attributes": {

roles/redis-server.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "redis-server",
3-
"description": "Redis server",
3+
"description": "A Redis server",
44
"default_attributes": {
55
"redis-server": {
66
}
77
},
88
"json_class": "Chef::Role",
99
"run_list": [
1010
"role[server]",
11-
"recipe[redis-server::default]",
12-
"monit_configs-tlq::redis-server"
11+
"recipe[rdr_redisio_wrapper::default]",
12+
"recipe[monit_configs-tlq::redis-server]"
1313
],
1414
"chef_type": "role"
1515
}

roles/server.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "server",
3-
"description": "A server of some kind...",
3+
"description": "The basics to be applied to a server of any kind",
44
"default_attributes": {
55
"firewall" : {
66
"allow_ssh" : true
@@ -33,10 +33,6 @@
3333
"hostname" : "yourhostname"
3434
},
3535
"web_interface" : {
36-
// access credentials for the web interface. Just
37-
// enabling this won't set up the web interface,
38-
// it will need either a vhost in nginx or its port
39-
// being allowed through ufw
4036
"allow" : ["yourusername","yourpassword"]
4137
}
4238
},
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Delivery for Local Phases Execution
2+
#
3+
# This file allows you to execute test phases locally on a workstation or
4+
# in a CI pipeline. The delivery-cli will read this file and execute the
5+
# command(s) that are configured for each phase. You can customize them
6+
# by just modifying the phase key on this file.
7+
#
8+
# By default these phases are configured for Cookbook Workflow only
9+
#
10+
11+
[local_phases]
12+
unit = "chef exec rspec spec/"
13+
lint = "chef exec cookstyle"
14+
# foodcritic has been deprecated in favor of cookstyle so we skip the syntax
15+
# phase now.
16+
syntax = "echo skipping syntax phase. Use lint phase instead."
17+
provision = "chef exec kitchen create"
18+
deploy = "chef exec kitchen converge"
19+
smoke = "chef exec kitchen verify"
20+
# The functional phase is optional, you can define it by uncommenting
21+
# the line below and running the command: `delivery local functional`
22+
# functional = ""
23+
cleanup = "chef exec kitchen destroy"
24+
25+
# Remote project.toml file
26+
#
27+
# Instead of the local phases above, you may specify a remote URI location for
28+
# the `project.toml` file. This is useful for teams that wish to centrally
29+
# manage the behavior of the `delivery local` command across many different
30+
# projects.
31+
#
32+
# remote_file = "https://url/project.toml"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
.vagrant
2+
*~
3+
*#
4+
.#*
5+
\#*#
6+
.*.sw[a-z]
7+
*.un~
8+
9+
# Bundler
10+
Gemfile.lock
11+
gems.locked
12+
bin/*
13+
.bundle/*
14+
15+
# test kitchen
16+
.kitchen/
17+
kitchen.local.yml
18+
19+
# Chef Infra
20+
Berksfile.lock
21+
.zero-knife.rb
22+
Policyfile.lock.json
23+
24+
.idea/
25+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# rdr_memcached_wrapper CHANGELOG
2+
3+
This file is used to list changes made in each version of the rdr_memcached_wrapper cookbook.
4+
5+
## 0.1.0
6+
7+
Initial release.
8+
9+
- change 0
10+
- change 1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Copyright 2021 The Authors
2+
3+
All rights reserved, do not redistribute.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Policyfile.rb - Describe how you want Chef Infra Client to build your system.
2+
#
3+
# For more information on the Policyfile feature, visit
4+
# https://docs.chef.io/policyfile/
5+
6+
# A name that describes what the system you're building with Chef does.
7+
name 'rdr_memcached_wrapper'
8+
9+
# Where to find external cookbooks:
10+
default_source :supermarket
11+
12+
# run_list: chef-client will run these recipes in the order specified.
13+
run_list 'rdr_memcached_wrapper::default'
14+
15+
# Specify a custom source for a single cookbook:
16+
cookbook 'rdr_memcached_wrapper', path: '.'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# rdr_memcached_wrapper
2+
3+
TODO: Enter the cookbook description here.
4+

0 commit comments

Comments
 (0)