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

puppet: Rename local_server => enterprise. 

(imported from commit 5faa269df5937f6db99098e44aaea7d0a4f2c14a)
This commit is contained in:
Tim Abbott 2013-11-12 12:16:36 -05:00
parent 21f1058fd2
commit 966fde261a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/zulip/manifests/local_server.pp → puppet/zulip/manifests/enterprise.pp
View File

@ -1,4 +1,4 @@
class zulip::local_server {
class zulip::enterprise {
include zulip::base
include zulip::app_frontend
include zulip::postgres_appdb

2
scripts/setup/install
View File

@ -20,7 +20,7 @@ apt-get install -y puppet git
cp -a /root/zulip/puppet/zulip/files/puppet.conf /etc/puppet/
mkdir -p /etc/zulip
echo -e "[machine]\npuppet_classes = zulip::local_server\ndeploy_type = local" > /etc/zulip/zulip.conf
echo -e "[machine]\npuppet_classes = zulip::enterprise\ndeploy_type = enterprise" > /etc/zulip/zulip.conf
/root/zulip/scripts/zulip-puppet-apply -f
# These server restarting bits should be moveable into puppet-land, ideally

2
zproject/local_settings.py
View File

@ -55,7 +55,7 @@ DEPLOYED = config_file.has_option('machine', 'deploy_type')
STAGING_DEPLOYED = DEPLOYED and config_file.get('machine', 'deploy_type') == 'staging'
TESTING_DEPLOYED = DEPLOYED and config_file.get('machine', 'deploy_type') == 'test'
ENTERPRISE = DEPLOYED and config_file.get('machine', 'deploy_type') == 'local'
ENTERPRISE = DEPLOYED and config_file.get('machine', 'deploy_type') == 'enterprise'
SESSION_SERIALIZER = "django.contrib.sessions.serializers.PickleSerializer"

2
zproject/settings.py
View File

@ -20,7 +20,7 @@ DEPLOYED = config_file.has_option('machine', 'deploy_type')
STAGING_DEPLOYED = DEPLOYED and config_file.get('machine', 'deploy_type') == 'staging'
TESTING_DEPLOYED = DEPLOYED and config_file.get('machine', 'deploy_type') == 'test'
ENTERPRISE = DEPLOYED and config_file.get('machine', 'deploy_type') == 'local'
ENTERPRISE = DEPLOYED and config_file.get('machine', 'deploy_type') == 'enterprise'
# Import variables like secrets from the local_settings file
# Import local_settings after determining the deployment/machine type