diff --git a/bots/process_ccache b/bots/process_ccache index 62244e7..08f8e48 100755 --- a/bots/process_ccache +++ b/bots/process_ccache @@ -19,7 +19,7 @@ file(api_key_path, "w").write(api_key + "\n") # Setup supervisord configuration supervisor_path = "/etc/supervisor/conf.d/%s.conf" % (program_name,) -template = "/home/humbug/humbug/bots/zmirror_private.conf.template" +template = "/home/humbug/zulip/bots/zmirror_private.conf.template" template_data = file(template).read() session_path = "/home/humbug/zephyr_sessions/%s" % (program_name,) diff --git a/bots/zephyr_mirror.py b/bots/zephyr_mirror.py index f01cd03..925be92 100755 --- a/bots/zephyr_mirror.py +++ b/bots/zephyr_mirror.py @@ -46,7 +46,7 @@ if options.sync_subscriptions: sys.exit(0) if options.forward_class_messages and not options.noshard: - sys.path.append("/home/humbug/humbug") + sys.path.append("/home/humbug/zulip") if options.on_startup_command is not None: subprocess.call([options.on_startup_command]) from zerver.lib.parallel import run_parallel diff --git a/bots/zmirror_private.conf.template b/bots/zmirror_private.conf.template index 4a08aaf..30a49b2 100644 --- a/bots/zmirror_private.conf.template +++ b/bots/zmirror_private.conf.template @@ -1,5 +1,5 @@ [program:zmirror-USERNAME] -command=python /home/humbug/humbug/bots/zephyr_mirror_backend.py --root-path=/home/humbug/humbug/bots --user=USERNAME --log-path=/home/humbug/logs/mirror-log-%(program_name)s --use-sessions --session-path=/home/humbug/zephyr_sessions/%(program_name)s --api-key-file=/home/humbug/api-keys/%(program_name)s --ignore-expired-tickets --nagios-path=/home/humbug/mirror_status/%(program_name)s --nagios-class=zulip-mirror-nagios +command=python /home/humbug/zulip/bots/zephyr_mirror_backend.py --root-path=/home/humbug/zulip/bots --user=USERNAME --log-path=/home/humbug/logs/mirror-log-%(program_name)s --use-sessions --session-path=/home/humbug/zephyr_sessions/%(program_name)s --api-key-file=/home/humbug/api-keys/%(program_name)s --ignore-expired-tickets --nagios-path=/home/humbug/mirror_status/%(program_name)s --nagios-class=zulip-mirror-nagios priority=200 ; the relative start priority (default 999) autostart=true ; start at supervisord start (default: true) autorestart=true ; whether/when to restart (default: unexpected) diff --git a/bots/zulip_git_config.py b/bots/zulip_git_config.py index 985c12a..f3707ee 100644 --- a/bots/zulip_git_config.py +++ b/bots/zulip_git_config.py @@ -30,5 +30,5 @@ def commit_notice_destination(repo, branch, commit): # Return None for cases where you don't want a notice sent return None -ZULIP_API_PATH = "/home/humbug/humbug/api" +ZULIP_API_PATH = "/home/humbug/zulip/api" ZULIP_SITE = "https://staging.zulip.com" diff --git a/bots/zulip_trac_config.py b/bots/zulip_trac_config.py index 0ec02c2..4747525 100644 --- a/bots/zulip_trac_config.py +++ b/bots/zulip_trac_config.py @@ -10,5 +10,5 @@ STREAM_FOR_NOTIFICATIONS = "trac" TRAC_BASE_TICKET_URL = "https://trac.zulip.net/ticket" TRAC_NOTIFY_FIELDS = ["description", "summary", "resolution", "comment", "owner"] -ZULIP_API_PATH = "/home/humbug/humbug/api" +ZULIP_API_PATH = "/home/humbug/zulip/api" ZULIP_SITE = "https://staging.zulip.com"