summaryrefslogtreecommitdiff
path: root/mason/share/zuul.conf
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2015-05-20 09:44:05 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2015-05-20 09:44:05 +0000
commit4b9268eb9cb1f8d140f543d9c4a3aa1aa8298994 (patch)
tree3e6c6e7fda3501b8af7aec03aff10e4e43130859 /mason/share/zuul.conf
parentfab1f7a06fa8a5a6be1fabaec0e565802de498fc (diff)
downloaddefinitions-4b9268eb9cb1f8d140f543d9c4a3aa1aa8298994.tar.gz
Install configuration files in the correct place
Also, have a more sensible default layout.yaml.
Diffstat (limited to 'mason/share/zuul.conf')
-rw-r--r--mason/share/zuul.conf26
1 files changed, 0 insertions, 26 deletions
diff --git a/mason/share/zuul.conf b/mason/share/zuul.conf
deleted file mode 100644
index 21066e70..00000000
--- a/mason/share/zuul.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-[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]
-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 }}