From 4b9268eb9cb1f8d140f543d9c4a3aa1aa8298994 Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam.coldrick@codethink.co.uk>
Date: Wed, 20 May 2015 09:44:05 +0000
Subject: Install configuration files in the correct place

Also, have a more sensible default layout.yaml.
---
 mason/share/zuul/zuul.conf | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 mason/share/zuul/zuul.conf

(limited to 'mason/share/zuul/zuul.conf')

diff --git a/mason/share/zuul/zuul.conf b/mason/share/zuul/zuul.conf
new file mode 100644
index 00000000..5d837430
--- /dev/null
+++ b/mason/share/zuul/zuul.conf
@@ -0,0 +1,27 @@
+[gearman]
+server={{ GEARMAN_HOST }}
+port={{ GEARMAN_PORT }}
+
+[gearman_server]
+start={{ START_GEARMAN }}
+
+[gerrit]
+server={{ GERRIT_HOSTNAME }}
+port={{ GERRIT_GIT_PORT }}
+baseurl=http://{{ GERRIT_HOSTNAME }}:{{ GERRIT_HTTP_PORT }}
+user={{ GERRIT_USER }}
+sshkey={{ GERRIT_SSH_KEY_PATH }}
+
+[zuul]
+layout_config=/etc/zuul/layout.yaml
+log_config=/etc/zuul/logging.conf
+pidfile=/var/run/zuul/zuul.pid
+state_dir=/var/lib/zuul
+git_dir=/var/lib/zuul/git
+status_url=http://127.0.0.1/logs
+
+[merger]
+git_dir=/var/lib/zuul/git
+git_user_email={{ GERRIT_USER }}@mason
+git_user_name={{ GERRIT_USER }}
+zuul_url=ssh://{{ GERRIT_USER }}@{{ GERRIT_HOSTNAME }}:{{ GERRIT_GIT_PORT }}
-- 
cgit v1.2.1