diff --git a/puppet/zulip/manifests/app_frontend_base.pp b/puppet/zulip/manifests/app_frontend_base.pp index 0463a640c9..760efb2a53 100644 --- a/puppet/zulip/manifests/app_frontend_base.pp +++ b/puppet/zulip/manifests/app_frontend_base.pp @@ -181,7 +181,6 @@ class zulip::app_frontend_base { file { [ '/home/zulip/tornado', - '/home/zulip/logs', '/home/zulip/prod-static', '/home/zulip/deployments', '/srv/zulip-npm-cache', diff --git a/puppet/zulip_ops/files/supervisor/conf.d/zmirror.conf b/puppet/zulip_ops/files/supervisor/conf.d/zmirror.conf index bbefbe88e9..d54a9a38ad 100644 --- a/puppet/zulip_ops/files/supervisor/conf.d/zmirror.conf +++ b/puppet/zulip_ops/files/supervisor/conf.d/zmirror.conf @@ -1,5 +1,5 @@ [program:zmirror] -command=/home/zulip/python-zulip-api/zulip/integrations/zephyr/zephyr_mirror.py --site=https://zephyr.zulipchat.com --stamp-path=/home/zulip/ --user=tabbott/extra --forward-class-messages --log-path=/home/zulip/logs/mirror-log --on-startup-command="/home/zulip/python-zulip-api/zulip/integrations/zephyr/zmirror-renew-kerberos" +command=/home/zulip/python-zulip-api/zulip/integrations/zephyr/zephyr_mirror.py --site=https://zephyr.zulipchat.com --stamp-path=/home/zulip/ --user=tabbott/extra --forward-class-messages --log-path=/var/log/zulip/mirror-log --on-startup-command="/home/zulip/python-zulip-api/zulip/integrations/zephyr/zmirror-renew-kerberos" 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/scripts/lib/upgrade-zulip-from-git b/scripts/lib/upgrade-zulip-from-git index c9b91f836d..281a1c4c60 100755 --- a/scripts/lib/upgrade-zulip-from-git +++ b/scripts/lib/upgrade-zulip-from-git @@ -50,7 +50,6 @@ if args.remote_url: remote_url = args.remote_url os.makedirs(DEPLOYMENTS_DIR, exist_ok=True) -os.makedirs("/home/zulip/logs", exist_ok=True) error_rerun_script = f"{DEPLOYMENTS_DIR}/current/scripts/upgrade-zulip-from-git {refname}" get_deployment_lock(error_rerun_script)