From dc7d44a245199f67d3a3020459a881ea81a1db6b Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 30 Oct 2018 11:39:42 -0700 Subject: [PATCH] puppet: Don't run calculate-first-visible-message-id on most systems. This should only be run on systems that are running zilencer, because the cron job is part of the zilencer project. --- puppet/zulip/manifests/app_frontend_once.pp | 6 +----- puppet/zulip_ops/manifests/prod_app_frontend.pp | 8 ++++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/puppet/zulip/manifests/app_frontend_once.pp b/puppet/zulip/manifests/app_frontend_once.pp index 51c73c8192..c853a6cc75 100644 --- a/puppet/zulip/manifests/app_frontend_once.pp +++ b/puppet/zulip/manifests/app_frontend_once.pp @@ -35,11 +35,7 @@ class zulip::app_frontend_once { } file { '/etc/cron.d/calculate-first-visible-message-id': - ensure => file, - owner => 'root', - group => 'root', - mode => '0644', - source => 'puppet:///modules/zulip/cron.d/calculate-first-visible-message-id', + ensure => absent, } file { '/etc/cron.d/clearsessions': diff --git a/puppet/zulip_ops/manifests/prod_app_frontend.pp b/puppet/zulip_ops/manifests/prod_app_frontend.pp index b9dcb893cf..ed7991998f 100644 --- a/puppet/zulip_ops/manifests/prod_app_frontend.pp +++ b/puppet/zulip_ops/manifests/prod_app_frontend.pp @@ -30,6 +30,14 @@ class zulip_ops::prod_app_frontend { source => 'puppet:///modules/zulip_ops/nagios_plugins/zulip_zephyr_mirror', } + # TODO: This should ideally move to a prod_app_frontend_once.pp + file { '/etc/cron.d/update-first-visible-message-id': + ensure => file, + owner => 'root', + group => 'root', + mode => '0644', + source => 'puppet:///modules/zulip/cron.d/calculate-first-visible-message-id', + } # Prod has our Apple Push Notifications Service private key at # /etc/ssl/django-private/apns-dist.pem }