Skip to content

Commit f03197a

Browse files
committed
Remove RabbitMQ SSL
1 parent 162c20d commit f03197a

9 files changed

+4
-68
lines changed

configure-rabbitmq-sensu.sh

+1-17
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,12 @@
22
##
33
# Configures RabbitMQ for Sensu
44
#
5-
# Provides:
6-
# - AMQP over SSL (TCP/5671)
7-
#
85
# Dependencies:
96
# - RabbitMQ
10-
# - SSL certificates generated with `generate-sensu-ssl.sh`
117
##
128
set -eux
139

14-
source env.sh
15-
SSL_PATH=$BASE_PATH/build/ssl_certs
16-
17-
cp $BASE_PATH/etc/rabbitmq/rabbitmq.config /etc/rabbitmq
18-
19-
mkdir -p /etc/rabbitmq/ssl
20-
21-
cp $SSL_PATH/server/key.pem /etc/rabbitmq/ssl
22-
cp $SSL_PATH/server/cert.pem /etc/rabbitmq/ssl
23-
cp $SSL_PATH/sensu_ca/cacert.pem /etc/rabbitmq/ssl
24-
25-
service rabbitmq-server restart
26-
2710
rabbitmqctl add_vhost sensu
2811
rabbitmqctl add_user sensu monit0r
2912
rabbitmqctl set_permissions -p sensu sensu ".*" ".*" ".*"
13+
rabbitmqctl set_user_tags sensu administrator

configure-repo-sensu.sh

100644100755
File mode changed.

etc/rabbitmq/rabbitmq.config

-11
This file was deleted.

etc/sensu/conf.d/rabbitmq.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
{
22
"rabbitmq": {
3-
"ssl": {
4-
"cert_chain_file": "/etc/sensu/ssl/cert.pem",
5-
"private_key_file": "/etc/sensu/ssl/key.pem"
6-
},
73
"host": "192.168.12.10",
8-
"port": 5671,
4+
"port": 5672,
95
"vhost": "sensu",
106
"user": "sensu",
117
"password": "monit0r"

generate-sensu-ssl.sh

-18
This file was deleted.

install-all-server.sh

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ source env.sh
88

99
$BASE_PATH/clean.sh
1010
$BASE_PATH/generate-lumberjack-ssl.sh
11-
$BASE_PATH/generate-sensu-ssl.sh
1211

1312
$BASE_PATH/install-elasticsearch.sh
1413
$BASE_PATH/install-elasticsearch-curator.sh

install-sensu-client.sh

+1-8
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,16 @@
33
# Installs the Sensu client component
44
#
55
# Dependencies:
6-
# - AMQP over SSL (TCP/5671 on 192.168.12.10)
6+
# - AMQP (TCP/5672 on 192.168.12.10)
77
# - Omnibus package for Sensu
8-
# - SSL certificates generated with `generate-sensu-ssl.sh`
98
##
109
set -eux
1110

1211
source env.sh
13-
SSL_PATH=$BASE_PATH/build/ssl_certs
1412

1513
cp $BASE_PATH/etc/sensu/conf.d/client.json /etc/sensu/conf.d
1614
cp $BASE_PATH/etc/sensu/conf.d/rabbitmq.json /etc/sensu/conf.d
1715

18-
mkdir -p /etc/sensu/ssl
19-
20-
cp $SSL_PATH/client/key.pem /etc/sensu/ssl
21-
cp $SSL_PATH/client/cert.pem /etc/sensu/ssl
22-
2316
update-rc.d sensu-client defaults
2417

2518
service sensu-client start

install-sensu-server.sh

-7
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,14 @@
66
# - Omnibus package for Sensu
77
# - RabbitMQ
88
# - Redis
9-
# - SSL certificates generated with `generate-sensu-ssl.sh`
109
##
1110
set -eux
1211

1312
source env.sh
14-
SSL_PATH=$BASE_PATH/build/ssl_certs
1513

1614
cp $BASE_PATH/etc/sensu/conf.d/redis.json /etc/sensu/conf.d
1715
cp $BASE_PATH/etc/sensu/conf.d/rabbitmq.json /etc/sensu/conf.d
1816

19-
mkdir -p /etc/sensu/ssl
20-
21-
cp $SSL_PATH/client/key.pem /etc/sensu/ssl
22-
cp $SSL_PATH/client/cert.pem /etc/sensu/ssl
23-
2417
update-rc.d sensu-server defaults
2518

2619
service sensu-server start

install-sensu.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ set -eux
99

1010
source env.sh
1111

12-
$BASE_PATH/install-sensu.sh
12+
$BASE_PATH/configure-repo-sensu.sh
1313

1414
apt-get install -yq sensu

0 commit comments

Comments
 (0)