cant use global w/ conflicts

pingles · Dec 28, 2014 · c3a0bd9 · c3a0bd9
1 parent 52732df
commit c3a0bd9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[email protected] b/[email protected]
@@ -32,4 +32,4 @@ ExecStop=-/usr/bin/docker stop consul
 ExecStopPost=-/bin/bash -c '/usr/bin/etcdctl rm /consul.io/bootstrap/machines/%m'
 
 [X-Fleet]
-Conflicts=consul@*.service
+Conflicts=consul*
diff --git a/consulagent.service → [email protected] b/consulagent.service → [email protected]
@@ -32,5 +32,4 @@ ExecStop=-/usr/bin/docker stop consul
 ExecStopPost=-/bin/bash -c '/usr/bin/etcdctl rm /consul.io/bootstrap/machines/%m'
 
 [X-Fleet]
-Conflicts=consul@*.service
-Global=true
+Conflicts=consul*