Merge pull request #2 from valberg/master

Renaming circus.conf to circusd.conf so it matches the init.sls
akoumjian · Jun 17, 2013 · c092d63 · c092d63
2 parents 70fdd74 + e1ebeee
commit c092d63
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/salt/circus/circus.conf → salt/circus/circusd.conf b/salt/circus/circus.conf → salt/circus/circusd.conf
@@ -10,4 +10,4 @@ stop on shutdown
 respawn
 exec /usr/local/bin/circusd --log-output /var/log/circus.log \
                       --pidfile /var/run/circusd.pid \
-                      /etc/circus.ini
+                      /etc/circus.ini