Modify hostname query in systemd service files and clean them

miscellaneous/firewall-init.service

 [Unit]
 [Unit]
 Description=CIRCLE firewall init
 Description=CIRCLE firewall init
 After=network.target
 After=network.target
-#Before=firewall.service
 
 
 [Service]
 [Service]
 User=root
 User=root

miscellaneous/firewall.service

@@ -7,10 +7,10 @@ After=firewall-init.service
 [Service]
 [Service]
 User=fw
 User=fw
 Group=fw
 Group=fw
+
 WorkingDirectory=/home/fw/fwdriver
 WorkingDirectory=/home/fw/fwdriver
 
 
-ExecStart=/bin/bash -c ". /home/fw/.virtualenvs/fw/bin/postactivate; . /home/fw/.virtualenvs/fw/bin/activate; exec celeryd -A fw -Q %H.firewall  --loglevel=info -c 1"
-#ExecStartPost=/bin/sudo /bin/systemctl restart dhcpd
+ExecStart=/bin/bash -c ". /home/fw/.virtualenvs/fw/bin/postactivate; . /home/fw/.virtualenvs/fw/bin/activate; exec celeryd -A fw -Q $(/bin/hostname -s).firewall  --loglevel=info -c 1"
 
 
 Restart=always
 Restart=always