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/zuul-merger.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mason/zuul-merger.service')

diff --git a/mason/zuul-merger.service b/mason/zuul-merger.service
index a3aa0ca5..c975a0de 100644
--- a/mason/zuul-merger.service
+++ b/mason/zuul-merger.service
@@ -4,7 +4,7 @@ After=zuul-server.service
 
 [Service]
 User=root
-ExecStart=/usr/bin/zuul-merger -d -c /etc/zuul.conf
+ExecStart=/usr/bin/zuul-merger -d
 
 [Install]
 WantedBy=multi-user.target
-- 
cgit v1.2.1