mirror of https://github.com/zulip/zulip.git
[manual] Enable local email mirror on all frontends.
This removed the cronjob from all app_frontend servers and enables the local Postfix mail server on the same. This is a no-op on staging if the parent commit has already been applied. To deploy this commit, run a puppet-apply on prod. (imported from commit 6d3977fd12088abcd33418279e9fa28f9b2a2006)
This commit is contained in:
parent
ca3430862c
commit
24f8492236
|
@ -2,6 +2,7 @@ class zulip::app_frontend {
|
|||
include zulip::rabbit
|
||||
include zulip::nginx
|
||||
include zulip::supervisor
|
||||
include zulip::postfix_localmail
|
||||
|
||||
$web_packages = [ # Needed for memcached usage
|
||||
"memcached",
|
||||
|
@ -151,4 +152,7 @@ class zulip::app_frontend {
|
|||
owner => 'zulip',
|
||||
group => 'zulip',
|
||||
}
|
||||
file { "/etc/cron.d/email-mirror":
|
||||
ensure => absent,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -101,13 +101,6 @@ class zulip_internal::prod_app_frontend {
|
|||
mode => 644,
|
||||
source => "puppet:///modules/zulip_internal/cron.d/send-digest-emails",
|
||||
}
|
||||
file { "/etc/cron.d/email-mirror":
|
||||
ensure => file,
|
||||
owner => "root",
|
||||
group => "root",
|
||||
mode => 644,
|
||||
source => "puppet:///modules/zulip/cron.d/email-mirror",
|
||||
}
|
||||
|
||||
# Prod has our Apple Push Notifications Service private key at
|
||||
# /etc/ssl/django-private/apns-dist.pem
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
class zulip_internal::staging_app_frontend {
|
||||
include zulip_internal::base
|
||||
include zulip_internal::app_frontend
|
||||
include zulip::postfix_localmail
|
||||
|
||||
file { "/etc/nginx/sites-available/zulip-staging":
|
||||
require => Package["nginx-full"],
|
||||
|
@ -18,9 +17,6 @@ class zulip_internal::staging_app_frontend {
|
|||
target => '/etc/nginx/sites-available/zulip-staging',
|
||||
notify => Service["nginx"],
|
||||
}
|
||||
file { "/etc/cron.d/email-mirror":
|
||||
ensure => absent,
|
||||
}
|
||||
file { "/etc/cron.d/active-user-stats":
|
||||
ensure => file,
|
||||
owner => "root",
|
||||
|
|
|
@ -145,21 +145,6 @@ GOOGLE_CLIENT_ID = "835904834568-77mtr5mtmpgspj9b051del9i9r5t4g4n.apps.googleuse
|
|||
# Administrator domain for this install
|
||||
ADMIN_DOMAIN = "zulip.com"
|
||||
|
||||
# Email mirror configuration
|
||||
# The email of the Zulip bot that the email gateway
|
||||
# should post as
|
||||
EMAIL_GATEWAY_BOT = "emailgateway@zulip.com"
|
||||
|
||||
EMAIL_GATEWAY_LOGIN = "emailgateway@zulip.com"
|
||||
EMAIL_GATEWAY_PASSWORD = "xxxxxxxxxxxxxxxx"
|
||||
EMAIL_GATEWAY_IMAP_SERVER = "imap.gmail.com"
|
||||
EMAIL_GATEWAY_IMAP_PORT = 993
|
||||
if DEPLOYED:
|
||||
EMAIL_GATEWAY_IMAP_FOLDER = "INBOX"
|
||||
else:
|
||||
# For local testing, only try to process messages in the Test folder.
|
||||
EMAIL_GATEWAY_IMAP_FOLDER = "Test"
|
||||
|
||||
# The email address pattern to use for auto-generated stream emails
|
||||
# The %s will be replaced with a unique token.
|
||||
if STAGING_DEPLOYED:
|
||||
|
|
Loading…
Reference in New Issue