Removed supervisrd.conf because it's unnecessary

Fix for "move" custom puppet manifests in

Dockerfile

@@ -12,13 +12,16 @@ RUN wget -q -O /root/zulip-ppa.asc https://zulip.com/dist/keys/zulip-ppa.asc &&
     echo "deb-src http://ppa.launchpad.net/tabbott/zulip/ubuntu trusty main" >> /etc/apt/sources.list.d/zulip.list && \
     apt-get -qq update && \
     apt-get -q dist-upgrade -y && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y puppet git python-dev python-six python-pbs rsync && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y puppet git python-dev python-six python-pbs && \
     mkdir -p "/root/zulip" "/etc/zulip" "$DATA_DIR" && \
     echo "[machine]\npuppet_classes = zulip::voyager\ndeploy_type = voyager" > /etc/zulip/zulip.conf && \
     cd /root/zulip && \
     git clone https://github.com/zulip/zulip.git . && \
     git checkout "$ZULIP_VERSION" && \
-    rsync -rva /root/puppet-zulip /root/zulip/puppet/zulip && \
+    rm -rf /root/zulip/puppet/manifests && \
+    mv /root/puppet-zulip/manifests /root/zulip/puppet && \
+    cp -rf /root/puppet-zulip/files/* /root/zulip/puppet/files/ && \
+    rm -rf /root/puppet-zulip && \
     /root/zulip/scripts/zulip-puppet-apply -f && \
     cp -fa /root/zulip/zproject/local_settings_template.py /etc/zulip/settings.py && \
     ln -nsf /etc/zulip/settings.py /root/zulip/zproject/local_settings.py && \

puppet/zulip/files/supervisor/supervisord.conf

@@ -1,31 +0,0 @@
-; supervisor config file
-
-[unix_http_server]
-file=/var/run/supervisor.sock   ; (the path to the socket file)
-chmod=0700                       ; socket file mode (default 0700)
-chown=zulip
-
-[supervisord]
-logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
-pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
-childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
-minfds=40000 ; file descriptor limit for children
-nodaemon=true
-
-; the below section must remain in the config file for RPC
-; (supervisorctl/web interface) to work, additional interfaces may be
-; added by defining them in separate rpcinterface: sections
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[supervisorctl]
-serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
-
-; The [include] section can just contain the "files" setting.  This
-; setting can list multiple files (separated by whitespace or
-; newlines).  It can also contain wildcards.  The filenames are
-; interpreted as relative to this file.  Included files *cannot*
-; include files themselves.
-
-[include]
-files = /etc/supervisor/conf.d/*.conf