Before and depends can be in same service

tower/models/service.py

@@ -92,13 +92,11 @@ class Service(Model):
                 for d in srv_descr[srv]["meta"]["depends"]:
                     if d not in deps:
                         deps[d] = []
-            elif "before" in srv_descr[srv]["meta"]:
-                deps[srv_descr[srv]["meta"]["before"]] = [srv]
-                if srv not in deps:
-                    deps[srv] = []
             else:
                 if srv not in deps:
                     deps[srv] = []
+            if "before" in srv_descr[srv]["meta"]:
+                deps[srv_descr[srv]["meta"]["before"]].extend([srv])
 
         order = dfs_topsort(deps)
         return order