mirror of https://github.com/zulip/zulip.git
Enterprise => Voyager.
(imported from commit 41b9a67301aeaf5fd40bbbb8f34a326ca98431fd)
This commit is contained in:
parent
3f7cb34b00
commit
e3f38acbce
|
@ -31,14 +31,14 @@ file is as follows:
|
||||||
key=<api key from the web interface>
|
key=<api key from the web interface>
|
||||||
email=<your email address>
|
email=<your email address>
|
||||||
|
|
||||||
If you are using Zulip Enterprise, you should also add
|
If you are using Zulip Voyager, you should also add
|
||||||
|
|
||||||
site=<your Zulip Enterprise server's URI>
|
site=<your Zulip Voyager server's URI>
|
||||||
|
|
||||||
Alternatively, you may explicitly use "--user" and "--api-key" in our
|
Alternatively, you may explicitly use "--user" and "--api-key" in our
|
||||||
examples, which is especially useful if you are running several bots
|
examples, which is especially useful if you are running several bots
|
||||||
which share a home directory. There is also a "--site" option for
|
which share a home directory. There is also a "--site" option for
|
||||||
setting the Zulip Enterprise server on the command line.
|
setting the Zulip Voyager server on the command line.
|
||||||
|
|
||||||
You can obtain your Zulip API key, create bots, and manage bots all
|
You can obtain your Zulip API key, create bots, and manage bots all
|
||||||
from your Zulip [settings page](https://zulip.com/#settings).
|
from your Zulip [settings page](https://zulip.com/#settings).
|
||||||
|
|
|
@ -49,7 +49,7 @@ RESUME_FILE = "/var/tmp/zulip_asana.state"
|
||||||
# When initially started, how many hours of messages to include.
|
# When initially started, how many hours of messages to include.
|
||||||
ASANA_INITIAL_HISTORY_HOURS = 1
|
ASANA_INITIAL_HISTORY_HOURS = 1
|
||||||
|
|
||||||
# If you're using Zulip Enterprise, set this to your Zulip Enterprise server
|
# If you're using Zulip Voyager, set this to your Zulip Voyager server
|
||||||
ZULIP_SITE = "https://api.zulip.com"
|
ZULIP_SITE = "https://api.zulip.com"
|
||||||
|
|
||||||
# If properly installed, the Zulip API should be in your import
|
# If properly installed, the Zulip API should be in your import
|
||||||
|
|
|
@ -41,7 +41,7 @@ ZULIP_STREAM_NAME = "basecamp"
|
||||||
## path, but if not, set a custom path below
|
## path, but if not, set a custom path below
|
||||||
ZULIP_API_PATH = None
|
ZULIP_API_PATH = None
|
||||||
|
|
||||||
# If you're using Zulip Enterprise, set this to your Zulip Enterprise server
|
# If you're using Zulip Voyager, set this to your Zulip Voyager server
|
||||||
ZULIP_SITE = "https://api.zulip.com"
|
ZULIP_SITE = "https://api.zulip.com"
|
||||||
|
|
||||||
# If you wish to log to a file rather than stdout/stderr,
|
# If you wish to log to a file rather than stdout/stderr,
|
||||||
|
|
|
@ -50,7 +50,7 @@ ZULIP_TICKETS_STREAM_NAME = "tickets"
|
||||||
# path, but if not, set a custom path below
|
# path, but if not, set a custom path below
|
||||||
ZULIP_API_PATH = None
|
ZULIP_API_PATH = None
|
||||||
|
|
||||||
# If you're using Zulip Enterprise, set this to your Zulip Enterprise server
|
# If you're using Zulip Voyager, set this to your Zulip Voyager server
|
||||||
ZULIP_SITE = "https://api.zulip.com"
|
ZULIP_SITE = "https://api.zulip.com"
|
||||||
|
|
||||||
# If you wish to log to a file rather than stdout/stderr,
|
# If you wish to log to a file rather than stdout/stderr,
|
||||||
|
|
|
@ -61,5 +61,5 @@ def format_commit_message(author, subject, commit_id):
|
||||||
## path, but if not, set a custom path below
|
## path, but if not, set a custom path below
|
||||||
ZULIP_API_PATH = None
|
ZULIP_API_PATH = None
|
||||||
|
|
||||||
# If you're using Zulip Enterprise, set this to your Zulip Enterprise server
|
# If you're using Zulip Voyager, set this to your Zulip Voyager server
|
||||||
ZULIP_SITE = "https://api.zulip.com"
|
ZULIP_SITE = "https://api.zulip.com"
|
||||||
|
|
|
@ -53,5 +53,5 @@ def commit_notice_destination(path, commit):
|
||||||
## path, but if not, set a custom path below
|
## path, but if not, set a custom path below
|
||||||
ZULIP_API_PATH = None
|
ZULIP_API_PATH = None
|
||||||
|
|
||||||
# If you're using Zulip Enterprise, set this to your Zulip Enterprise server
|
# If you're using Zulip Voyager, set this to your Zulip Voyager server
|
||||||
ZULIP_SITE = "https://api.zulip.com"
|
ZULIP_SITE = "https://api.zulip.com"
|
||||||
|
|
|
@ -47,5 +47,5 @@ TRAC_NOTIFY_FIELDS = ["description", "summary", "resolution", "comment", "owner"
|
||||||
## path, but if not, set a custom path below
|
## path, but if not, set a custom path below
|
||||||
ZULIP_API_PATH = None
|
ZULIP_API_PATH = None
|
||||||
|
|
||||||
# If you're using Zulip Enterprise, set this to your Zulip Enterprise server
|
# If you're using Zulip Voyager, set this to your Zulip Voyager server
|
||||||
ZULIP_SITE = "https://api.zulip.com"
|
ZULIP_SITE = "https://api.zulip.com"
|
||||||
|
|
|
@ -97,7 +97,7 @@ def generate_option_group(parser, prefix=''):
|
||||||
group = optparse.OptionGroup(parser, 'Zulip API configuration')
|
group = optparse.OptionGroup(parser, 'Zulip API configuration')
|
||||||
group.add_option('--%ssite' % (prefix,),
|
group.add_option('--%ssite' % (prefix,),
|
||||||
dest="zulip_site",
|
dest="zulip_site",
|
||||||
help="Zulip Enterprise server URI (if using Zulip Enterprise)",
|
help="Zulip Voyager server URI (if using Zulip Voyager)",
|
||||||
default=None)
|
default=None)
|
||||||
group.add_option('--%sapi-key' % (prefix,),
|
group.add_option('--%sapi-key' % (prefix,),
|
||||||
dest="zulip_api_key",
|
dest="zulip_api_key",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# This file is managed by puppet; local changes will be overridden.
|
# This file is managed by puppet; local changes will be overridden.
|
||||||
|
|
||||||
smtpd_banner = $myhostname ESMTP $mail_name (Zulip Enterprise)
|
smtpd_banner = $myhostname ESMTP $mail_name (Zulip Voyager)
|
||||||
biff = no
|
biff = no
|
||||||
|
|
||||||
# appending .domain is the MUA's job.
|
# appending .domain is the MUA's job.
|
||||||
|
|
|
@ -446,7 +446,7 @@ define service {
|
||||||
define service {
|
define service {
|
||||||
use generic-service
|
use generic-service
|
||||||
host staging
|
host staging
|
||||||
service_description Check email deliverer process which is only used on Zulip Enterprise
|
service_description Check email deliverer process which is only used on Zulip Voyager
|
||||||
check_command check_email_deliverer_process
|
check_command check_email_deliverer_process
|
||||||
contact_groups admins
|
contact_groups admins
|
||||||
}
|
}
|
||||||
|
@ -454,7 +454,7 @@ define service {
|
||||||
define service {
|
define service {
|
||||||
use generic-service
|
use generic-service
|
||||||
host staging
|
host staging
|
||||||
service_description Check email deliverer backlog which is only used on Zulip Enterprise
|
service_description Check email deliverer backlog which is only used on Zulip Voyager
|
||||||
check_command check_email_deliverer_backlog
|
check_command check_email_deliverer_backlog
|
||||||
contact_groups admins
|
contact_groups admins
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,7 +60,7 @@ server {
|
||||||
alias /srv/www/dist/;
|
alias /srv/www/dist/;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Enterprise downloads
|
# Voyager downloads
|
||||||
location /enterprise/ {
|
location /enterprise/ {
|
||||||
alias /srv/www/enterprise/;
|
alias /srv/www/enterprise/;
|
||||||
autoindex on;
|
autoindex on;
|
||||||
|
|
|
@ -16,7 +16,7 @@ Requirements:
|
||||||
|
|
||||||
=======================================================================
|
=======================================================================
|
||||||
|
|
||||||
How to install Zulip Enterprise:
|
How to install Zulip Voyager:
|
||||||
|
|
||||||
These instructions should be followed as root.
|
These instructions should be followed as root.
|
||||||
|
|
||||||
|
@ -91,7 +91,7 @@ login via the SSO solution.
|
||||||
|
|
||||||
=======================================================================
|
=======================================================================
|
||||||
|
|
||||||
Maintaining Zulip Enterprise:
|
Maintaining Zulip Voyager:
|
||||||
|
|
||||||
* To upgrade to a new version, download the appropriate tarball from
|
* To upgrade to a new version, download the appropriate tarball from
|
||||||
https://zulip.com/enterprise/download, and then run
|
https://zulip.com/enterprise/download, and then run
|
||||||
|
@ -112,7 +112,7 @@ Maintaining Zulip Enterprise:
|
||||||
a regular basis to ensure that it is up to date with the latest
|
a regular basis to ensure that it is up to date with the latest
|
||||||
security patches.
|
security patches.
|
||||||
|
|
||||||
* To use the Zulip API with Zulip Enterprise, you will need to use the
|
* To use the Zulip API with Zulip Voyager, you will need to use the
|
||||||
API endpoint of e.g. "https://zulip.yourdomain.net/api". Our Python
|
API endpoint of e.g. "https://zulip.yourdomain.net/api". Our Python
|
||||||
API examples support this via the
|
API examples support this via the
|
||||||
"--site=https://zulip.yourdomain.net" argument. The API bindings
|
"--site=https://zulip.yourdomain.net" argument. The API bindings
|
||||||
|
|
|
@ -7,7 +7,7 @@ from django.conf import settings
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
help = """Checks your Zulip Enterprise Django configuration for issues."""
|
help = """Checks your Zulip Voyager Django configuration for issues."""
|
||||||
|
|
||||||
option_list = BaseCommand.option_list + ()
|
option_list = BaseCommand.option_list + ()
|
||||||
def handle(self, **options):
|
def handle(self, **options):
|
||||||
|
|
|
@ -63,7 +63,7 @@ def send_email_job(job):
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
help = """Deliver emails queued by various parts of Zulip (either for immediate sending or sending at a specified time).
|
help = """Deliver emails queued by various parts of Zulip (either for immediate sending or sending at a specified time).
|
||||||
|
|
||||||
Run this command under supervisor. We use Mandrill for our deploy; this is for Zulip Enterprise deploys.
|
Run this command under supervisor. We use Mandrill for our deploy; this is for Zulip Voyager deploys.
|
||||||
|
|
||||||
Usage: python manage.py deliver_email
|
Usage: python manage.py deliver_email
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -25,7 +25,7 @@ def create_users(name_list, bot=False):
|
||||||
bulk_create_users(realms, user_set, bot)
|
bulk_create_users(realms, user_set, bot)
|
||||||
|
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
help = "Populate an initial database for Zulip Enterprise"
|
help = "Populate an initial database for Zulip Voyager"
|
||||||
|
|
||||||
option_list = BaseCommand.option_list + (
|
option_list = BaseCommand.option_list + (
|
||||||
make_option('--extra-users',
|
make_option('--extra-users',
|
||||||
|
|
|
@ -18,7 +18,7 @@ class Command(BaseCommand):
|
||||||
(The number of currently overdue (by at least a minute) email jobs)
|
(The number of currently overdue (by at least a minute) email jobs)
|
||||||
|
|
||||||
This is run as part of the nagios health check for the deliver_email command.
|
This is run as part of the nagios health check for the deliver_email command.
|
||||||
Please note that this is only currently useful for Zulip Enterprise deploys.
|
Please note that this is only currently useful for Zulip Voyager deploys.
|
||||||
|
|
||||||
Usage: python manage.py print_email_delivery_backlog
|
Usage: python manage.py print_email_delivery_backlog
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -1261,7 +1261,7 @@ class Referral(models.Model):
|
||||||
email = models.EmailField(blank=False, null=False)
|
email = models.EmailField(blank=False, null=False)
|
||||||
timestamp = models.DateTimeField(auto_now_add=True, null=False)
|
timestamp = models.DateTimeField(auto_now_add=True, null=False)
|
||||||
|
|
||||||
# This table only gets used on Zulip Enterprise instances
|
# This table only gets used on Zulip Voyager instances
|
||||||
# For reasons of deliverability (and sending from multiple email addresses),
|
# For reasons of deliverability (and sending from multiple email addresses),
|
||||||
# we will still send from mandrill when we send things from the (staging.)zulip.com install
|
# we will still send from mandrill when we send things from the (staging.)zulip.com install
|
||||||
class ScheduledJob(models.Model):
|
class ScheduledJob(models.Model):
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# Settings for Zulip Enterprise
|
# Settings for Zulip Voyager
|
||||||
|
|
||||||
### MANDATORY SETTINGS
|
### MANDATORY SETTINGS
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@
|
||||||
EXTERNAL_HOST = ''
|
EXTERNAL_HOST = ''
|
||||||
|
|
||||||
# The email address for the person or team who maintain the Zulip
|
# The email address for the person or team who maintain the Zulip
|
||||||
# Enterprise installation. Will also get support emails. (e.g. zulip-admin@example.com)
|
# Voyager installation. Will also get support emails. (e.g. zulip-admin@example.com)
|
||||||
ZULIP_ADMINISTRATOR = 'zulip-admin@example.com'
|
ZULIP_ADMINISTRATOR = 'zulip-admin@example.com'
|
||||||
|
|
||||||
# The domain for your organization, e.g. example.com
|
# The domain for your organization, e.g. example.com
|
||||||
|
|
Loading…
Reference in New Issue