Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move servers/configure-rabbitmq to scripts/setup/. 

(imported from commit 2b4d5ccb88675447ae744fb985246211deef7486)
This commit is contained in:
Tim Abbott 2013-10-25 17:00:05 -04:00
parent b58be7fcb5
commit 0a44ba2a28
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/configure-rabbitmq → scripts/setup/configure-rabbitmq
View File

@ -4,6 +4,6 @@
# with a real password
rabbitmqctl delete_user guest
rabbitmqctl add_user zulip $($(dirname $0)/../tools/get-django-setting RABBITMQ_PASSWORD)
rabbitmqctl add_user zulip $($(dirname $0)/../../tools/get-django-setting RABBITMQ_PASSWORD)
rabbitmqctl set_user_tags zulip administrator
rabbitmqctl set_permissions -p / zulip '.*' '.*' '.*'

4
servers/puppet/modules/zulip/manifests/rabbit.pp
View File

@ -26,7 +26,7 @@ class zulip::rabbit {
group => "root",
mode => 644,
source => "puppet:///modules/zulip/rabbitmq/rabbitmq-server",
}
}
file { "/etc/rabbitmq/rabbitmq.config":
require => Package[rabbitmq-server],
@ -37,5 +37,5 @@ class zulip::rabbit {
source => "puppet:///modules/zulip/rabbitmq/rabbitmq.config",
}
# TODO: Should also call exactly once "servers/configure-rabbitmq"
# TODO: Should also call exactly once "configure-rabbitmq"
}

1
zproject/local_settings.py
View File

@ -23,7 +23,6 @@ INITIAL_PASSWORD_SALT = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
# FIXME: store this password more securely
SHARED_SECRET = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
# This password also appears in servers/configure-rabbitmq
RABBITMQ_PASSWORD = 'xxxxxxxxxxxxxxxx'
MAILCHIMP_API_KEY = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-us4'