Updates for zulip PR files

custom_zulip_files/puppet/zulip/files/cron.d/send-digest-emails

@@ -0,0 +1,4 @@
+MAILTO=root
+
+# Send digest emails once a day. Time is in UTC.
+0 18 * * *   zulip cd /home/zulip/deployments/current && python2.7 manage.py enqueue_digest_emails

custom_zulip_files/puppet/zulip/files/nagios_plugins/check_queue_worker_errors

@@ -3,6 +3,7 @@
 """
 Nagios plugin to check that none of our queue workers have reported errors.
 """
+from __future__ import print_function
 
 import sys
 sys.path.append('/home/zulip/deployments/current')

custom_zulip_files/puppet/zulip/files/postgresql/process_fts_updates

@@ -44,7 +44,7 @@ try:
     os.environ['DJANGO_SETTINGS_MODULE'] = 'zproject.settings'
     from django.conf import settings
     remote_postgres_host = settings.REMOTE_POSTGRES_HOST
-except ImportError, e:
+except ImportError as e:
     # process_fts_updates also supports running locally on a remote
     # postgres server; in that case, one can just connect to localhost
     remote_postgres_host = ''

custom_zulip_files/puppet/zulip/files/supervisor/conf.d/zulip.conf

@@ -57,7 +57,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-user-activity]
-command=python2.7 /home/zulip/deployments/current/manage.py process_queue user_activity
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue --queue_name=user_activity
 priority=300                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -71,7 +71,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-user-activity-interval]
-command=python2.7 /home/zulip/deployments/current/manage.py process_queue user_activity_interval
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue --queue_name=user_activity_interval
 priority=300                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -85,7 +85,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-user-presence]
-command=python2.7 /home/zulip/deployments/current/manage.py process_queue user_presence
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue --queue_name=user_presence
 priority=300                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -99,7 +99,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-signups]
-command=python2.7 /home/zulip/deployments/current/manage.py process_queue signups
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue --queue_name=signups
 priority=400                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -113,7 +113,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-confirmation-emails]
-command=python2.7 /home/zulip/deployments/current/manage.py process_queue invites
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue --queue_name=invites
 priority=500                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -127,7 +127,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-missedmessage_reminders]
-command=python2.7 /home/zulip/deployments/current/manage.py process_queue missedmessage_emails
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue --queue_name=missedmessage_emails
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -141,7 +141,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-missedmessage_mobile_notifications]
-command=python2.7 /home/zulip/deployments/current/manage.py process_queue missedmessage_mobile_notifications
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue --queue_name=missedmessage_mobile_notifications
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -155,7 +155,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-slowqueries]
-command=python2.7 /home/zulip/deployments/current/manage.py process_queue slow_queries
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue --queue_name=slow_queries
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -169,7 +169,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-message_sender]
-command=python2.7 /home/zulip/deployments/current/manage.py process_queue message_sender %(process_num)s
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue --queue_name=message_sender --worker_num=%(process_num)s
 process_name=%(program_name)s-%(process_num)s
 priority=350                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
@@ -185,7 +185,7 @@ directory=/home/zulip/deployments/current/
 numprocs=5
 
 [program:zulip-events-feedback_messages]
-command=python2.7 /home/zulip/deployments/current/manage.py process_queue feedback_messages
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue --queue_name=feedback_messages
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -199,7 +199,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-error_reports]
-command=python2.7 /home/zulip/deployments/current/manage.py process_queue error_reports
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue --queue_name=error_reports
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -213,7 +213,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-digest_emails]
-command=python2.7 /home/zulip/deployments/current/manage.py process_queue digest_emails
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue --queue_name=digest_emails
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -227,7 +227,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-email_mirror]
-command=python2.7 /home/zulip/deployments/current/manage.py process_queue email_mirror
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue --queue_name=email_mirror
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)

custom_zulip_files/puppet/zulip/manifests/app_frontend.pp

@@ -18,6 +18,15 @@ class zulip::app_frontend {
     notify => Service["nginx"],
   }
 
+  # Trigger daily digest e-mails
+  file { "/etc/cron.d/send-digest-emails":
+    ensure => file,
+    owner  => "root",
+    group  => "root",
+    mode => 644,
+    source => "puppet:///modules/zulip/cron.d/send-digest-emails",
+  }
+
   # Restart the server regularly to avoid potential memory leak problems.
   file { "/etc/cron.d/restart-zulip":
     ensure => file,

custom_zulip_files/puppet/zulip/manifests/base.pp

@@ -5,8 +5,11 @@ class zulip::base {
                      # Dependencies of our API
                      "python-requests",
                      "python-simplejson",
+                     "python-typing",
                      # For development/debugging convenience
                      "ipython",
+                     # Used in scripts
+                     "netcat",
                      ]
   package { $base_packages: ensure => "installed" }
 

custom_zulip_files/puppet/zulip/manifests/postfix_localmail.pp

@@ -0,0 +1,76 @@
+class zulip::postfix_localmail {
+  $postfix_packages = [ "postfix", ]
+
+  if $fqdn == '' {
+    fail("Your system does not have a fully-qualified domain name defined. See hostname(1).")
+  }
+  package { $postfix_packages:
+    ensure => "installed",
+    require => File['/etc/mailname'],
+  }
+
+  service { 'postfix':
+  }
+
+  file {'/etc/mailname':
+    ensure  => file,
+    mode    => 0644,
+    owner   => root,
+    group   => root,
+    content => "${fqdn}",
+  }
+
+  file {'/etc/postfix/main.cf':
+    ensure  => file,
+    mode    => 0644,
+    owner   => root,
+    group   => root,
+    content => template('zulip/postfix/main.cf.erb'),
+    require => Package[postfix],
+    notify  => Service['postfix'],
+  }
+  file {'/etc/postfix/master.cf':
+    ensure  => file,
+    mode    => 0644,
+    owner   => root,
+    group   => root,
+    source  => "puppet:///modules/zulip/postfix/master.cf",
+    require => Package[postfix],
+    notify  => Service['postfix'],
+  }
+
+  file {'/etc/postfix/virtual':
+    ensure  => file,
+    mode    => 0644,
+    owner   => root,
+    group   => root,
+    source  => "puppet:///modules/zulip/postfix/virtual",
+    require => Package[postfix],
+  }
+  exec {'postmap /etc/postfix/virtual':
+    subscribe   => File['/etc/postfix/virtual'],
+    refreshonly => true,
+    require     => [
+		     File['/etc/postfix/main.cf'],
+		     Package[postfix],
+		   ],
+  }
+
+  file {'/etc/postfix/transport':
+    ensure  => file,
+    mode    => 0644,
+    owner   => root,
+    group   => root,
+    source  => "puppet:///modules/zulip/postfix/transport",
+    require => Package[postfix],
+  }
+  exec {'postmap /etc/postfix/transport':
+    subscribe   => File['/etc/postfix/transport'],
+    refreshonly => true,
+    require     => [
+		     File['/etc/postfix/main.cf'],
+		     Package[postfix],
+		   ],
+  }
+
+}