Pushed to new version

Added fixed supervisor puppet manifest

custom_zulip_files/puppet/zulip/manifests/supervisor.pp

@@ -4,6 +4,33 @@ class zulip::supervisor {
                           ]
   package { $supervisor_packages: ensure => "installed" }
 
+  service { "supervisor":
+    ensure     => running,
+    require    => [File["/var/log/zulip"],
+                Package["supervisor"],
+                ],
+
+    hasstatus  => true,
+    status     => "/bin/true",
+    start      => "/bin/true",
+
+    # The "restart" option in the init script does not work.  We could
+    # tell Puppet to fall back to stop/start, which does work, but the
+    # better option is to tell supervisord to reread its config via
+    # supervisorctl and then to "update".  You need to do both --
+    # after a "reread", supervisor won't actually take actual based on
+    # the changed configuration until you do an "update" (I assume
+    # this is so you can check if your config file parses without
+    # doing anything, but it's really confusing)
+    #
+    # Also, to handle the case that supervisord wasn't running at all,
+    # we check if it is not running and if so, start it.
+    #
+    # We use supervisor[d] as the pattern so the bash/grep commands don't match.
+    hasrestart => false,
+    restart    => "/bin/true",
+  }
+
   file { "/etc/supervisor/supervisord.conf":
     require => Package[supervisor],
     ensure => file,
@@ -11,6 +38,7 @@ class zulip::supervisor {
     group => "root",
     mode => 644,
     source => "puppet:///modules/zulip/supervisor/supervisord.conf",
+    notify => Service["supervisor"],
   }
 
   if $zulip::base::release_name == "xenial" {