Restart services on package change

servo-master is updated in-place instead of a fresh machine being built
for every update, so this ensures services are restarted when the
underlying code is updated.

buildbot/master.sls

@@ -9,9 +9,8 @@ buildbot-master:
       - pkg: pip
   service.running:
     - enable: True
-    - require:
-      - pip: buildbot-master
     - watch:
+      - pip: buildbot-master
       - file: /home/servo/buildbot/master
       - file: /etc/init/buildbot-master.conf
 

nginx/init.sls

@@ -2,7 +2,7 @@ nginx:
   pkg.installed: []
   service.running:
     - enable: True
-    - require:
+    - watch:
       - pkg: nginx
 
 /etc/nginx/sites-available/default:

xvfb/init.sls

@@ -9,7 +9,6 @@ xvfb:
   pkg.installed: []
   service.running:
     - enable: True
-    - require:
-      - pkg: xvfb
     - watch:
+      - pkg: xvfb
       - file: /etc/init/xvfb.conf