From 37329bdf196cc4baebb0a5245e871c6d58b395ba Mon Sep 17 00:00:00 2001
From: Alexander Trost <Galexrt@googlemail.com>
Date: Mon, 5 Oct 2015 16:23:02 +0200
Subject: [PATCH] Added "example" zulip.conf

---
 Dockerfile                    | 1 +
 includes/etc/zulip/zulip.conf | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 includes/etc/zulip/zulip.conf

diff --git a/Dockerfile b/Dockerfile
index 2e57268..9ae3001 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ ENV ZULIP_GROUP="zulip" ZULIP_USER="zulip" ZULIP_DIR="/home/zulip" \
 
 ADD entrypoint.sh /entrypoint.sh
 # TODO: Change this to the docker build repo including all required files
+# zulip.conf file is also located in includes folder
 RUN chmod 755 /entrypoint.sh && \
     groupadd -r "zulip" && \
     useradd -r -g "zulip" -d "/home/zulip" "zulip" && \
diff --git a/includes/etc/zulip/zulip.conf b/includes/etc/zulip/zulip.conf
new file mode 100644
index 0000000..18581a5
--- /dev/null
+++ b/includes/etc/zulip/zulip.conf
@@ -0,0 +1,3 @@
+[machine]
+puppet_classes = zulip::voyager
+deploy_type = voyager