Improves code-style

unit-files/haproxy-confd.service

 [Unit]
 Description=%p
-After=docker.service
+
+# Requirements
 Requires=docker.service
 
+# Dependency ordering
+After=docker.service
+
 [Service]
 Restart=always
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
-ExecStart=/usr/bin/docker run\
---name %p\
--v /data/server-wide/haproxy/:/etc/haproxy/\
--v /data/indiehosters/confd/:/etc/confd/\
--v /var/run/docker.sock:/var/run/docker.sock\
-indiehosters/confd
+ExecStart=/usr/bin/docker run \
+  --name %p \
+  -v /data/server-wide/haproxy/:/etc/haproxy/ \
+  -v /data/indiehosters/confd/:/etc/confd/ \
+  -v /var/run/docker.sock:/var/run/docker.sock \
+  indiehosters/confd
 ExecReload=/usr/bin/docker restart %p
 ExecStop=/usr/bin/docker stop %p
 

unit-files/haproxy.service

 [Unit]
 Description=%p
-After=docker.service
+
+# Requirements
 Requires=docker.service
 
+# Dependency ordering
+After=docker.service
+
 [Service]
 Restart=always
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
-ExecStart=/usr/bin/docker run\
---name %p\
--v /data/server-wide/haproxy:/etc/haproxy\
--p 80:80\
--p 443:443\
-indiehosters/haproxy
+ExecStart=/usr/bin/docker run \
+  --name %p \
+  -v /data/server-wide/haproxy:/etc/haproxy \
+  -p 80:80 \
+  -p 443:443 \
+  indiehosters/haproxy
 ExecReload=/usr/bin/docker restart %p
 ExecStop=/usr/bin/docker stop %p
 

unit-files/nginx-discovery@.service

@@ -5,17 +5,18 @@ Description=%p for %i etcd registration
 Requires=etcd.service
 Requires=nginx@%i.service
 
-# Dependency ordering and binding
+# Dependency ordering
 After=etcd.service
 After=nginx@%i.service
+
+# Dependency binding
 BindsTo=nginx@%i.service
 
 [Service]
-
 TimeoutStartSec=0
 # Start
 ## Test whether service is accessible and then register useful information
-ExecStart=/bin/bash -c '\
+ExecStart=/bin/bash -c ' \
   sleep 3; \
   while true; do \
     app=`echo %p | cut -d"-" -f1`; \
@@ -30,6 +31,6 @@ ExecStart=/bin/bash -c '\
   done'
 
 # Stop
-ExecStop=/bin/bash -ceux '\
-  app=`echo %p | cut -d"-" -f1`;\
+ExecStop=/bin/bash -ceux ' \
+  app=`echo %p | cut -d"-" -f1`; \
   /usr/bin/etcdctl rm /services/$app/%i

unit-files/nginx-importer@.service

-[Unit]  
+[Unit]
 Description=nginx importer
+
+# Dependency ordering
 Before=nginx@%i.service
 
 [Service]

unit-files/nginx@.service

 [Unit]
 Description=%p-%i
-After=docker.service
+
+# Requirements
 Requires=docker.service
 Requires=etcd.service
 Requires=%p-importer@%i.service
-After=%p-importer@%i.service
 Requires=%p-discovery@%i.service
+
+# Dependency ordering
 Before=%p-discovery@%i.service
+After=docker.service
+After=%p-importer@%i.service
 
 [Service]
 Restart=always
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p-%i
 ExecStartPre=-/usr/bin/docker rm %p-%i
-ExecStart=/usr/bin/docker run\
---name %p-%i\
--v /data/per-user/%i/%p/data/www-content:/app\
-indiehosters/nginx
+ExecStart=/usr/bin/docker run \
+  --name %p-%i \
+  -v /data/per-user/%i/%p/data/www-content:/app \
+  indiehosters/nginx
 ExecReload=/usr/bin/docker restart %p-%i
 ExecStop=/usr/bin/docker stop %p-%i
 

unit-files/postfix.service

 [Unit]
 Description=%p
-After=docker.service
+
+# Requirements
 Requires=docker.service
 
+# Dependency ordering
+After=docker.service
+
 [Service]
 Restart=always
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
-ExecStart=/usr/bin/docker run\
---name %p\
--p 25:25\
--v /data/server-wide/postfix/:/data\
-indiehosters/postfix-forwarder
+ExecStart=/usr/bin/docker run \
+  --name %p \
+  -v /data/server-wide/postfix/:/data \
+  -p 25:25 \
+  indiehosters/postfix-forwarder
 ExecReload=/usr/bin/docker restart %p
 ExecStop=/usr/bin/docker stop %p