diff --git a/roles/archweb/defaults/main.yml b/roles/archweb/defaults/main.yml
index 56a8d6a10adf2685a2bd1aaa325d8b8d2c10cfbf..fdd476fea0a452d894b3d91f9a12a8fd5fe9dc28 100644
--- a/roles/archweb/defaults/main.yml
+++ b/roles/archweb/defaults/main.yml
@@ -1,4 +1,7 @@
 ---
 archweb_dir: '/srv/http/archweb'
 archweb_domain: 'www.archlinux.org'
+archweb_site: true
+archweb_mirrorcheck: false
+archweb_reporead: false
 archweb_services: false
\ No newline at end of file
diff --git a/roles/archweb/tasks/main.yml b/roles/archweb/tasks/main.yml
index 6091221268536547aa8fafacd30691acfc7c170b..e667c7616bdeaa64969153535064dd3cf493b71a 100644
--- a/roles/archweb/tasks/main.yml
+++ b/roles/archweb/tasks/main.yml
@@ -13,9 +13,11 @@
   template: src=nginx.d.conf.j2 dest=/etc/nginx/nginx.d/archweb.conf owner=root group=root mode=644
   notify:
     - restart nginx
+  when: archweb_site
 
 - name: make nginx log dir
   file: path=/var/log/nginx/{{ archweb_domain }} state=directory owner=http group=log mode=755
+  when: archweb_site
 
 - name: clone archweb repo
   git: repo=git://git.archlinux.org/archweb.git dest="{{ archweb_dir }}"
@@ -34,6 +36,7 @@
 
 - name: create media dir
   file: state=directory owner=archweb group=archweb path="{{ archweb_dir }}/media"
+  when: archweb_site
 
 - name: fix home permissions
   file: state=directory owner=archweb group=archweb path="{{ archweb_dir }}"
@@ -42,37 +45,41 @@
   template: src="archweb-reporead.service.j2" dest="/etc/systemd/system/archweb-reporead.service" owner=root group=root mode=0644
   notify:
     - daemon reload
-  when: archweb_services
+  when: archweb_services or archweb_reporead
 
-- name: install mirrorcheck service and timer
+- name: install mirrorcheck service
   template: src="archweb-mirrorcheck.service.j2" dest="/etc/systemd/system/archweb-mirrorcheck.service" owner=root group=root mode=0644
   notify:
     - daemon reload
-  when: archweb_services
+  when: archweb_services or archweb_mirrorcheck
 
 - name: install mirrorcheck timer
   template: src="archweb-mirrorcheck.timer.j2" dest="/etc/systemd/system/archweb-mirrorcheck.timer" owner=root group=root mode=0644
   notify:
     - daemon reload
-  when: archweb_services
+  when: archweb_services or archweb_mirrorcheck
 
 - name: install archweb memcached service
   template: src="archweb-memcached.service.j2" dest="/etc/systemd/system/archweb-memcached.service" owner=root group=root mode=0644
   notify:
     - daemon reload
+  when: archweb_site
 
 - name: configure archweb
   template: src=local_settings.py.j2 dest=/srv/http/archweb/local_settings.py owner=archweb group=archweb mode=0660
 
 - name: deploy archweb
   template: src=archweb.ini.j2 dest=/etc/uwsgi/vassals/archweb.ini owner=archweb group=http mode=0644
+  when: archweb_site
 
 - name: start and enable archweb memcached service
   service: name="archweb-memcached.service" enabled=yes state=started
+  when: archweb_site
 
-- name: start and enable archweb services
-  service: name="{{ item }}" enabled=yes state=started
-  with_items:
-    - archweb-reporead.service
-    - archweb-mirrorcheck.timer
-  when: archweb_services
+- name: start and enable archweb reporead service
+  service: name="archweb-reporead.service" enabled=yes state=started
+  when: archweb_services or archweb_reporead
+
+- name: start and enable archweb mirrorcheck timer
+  service: name="archweb-mirrorcheck.timer" enabled=yes state=started
+  when: archweb_services or archweb_mirrorcheck
diff --git a/roles/archweb/templates/archweb-mirrorcheck.service.j2 b/roles/archweb/templates/archweb-mirrorcheck.service.j2
index 0ee3aa246b40d4aa43de13b10fa3c82c7e011224..1e16475c26eab68279c73e3f552cf17b7d971a74 100644
--- a/roles/archweb/templates/archweb-mirrorcheck.service.j2
+++ b/roles/archweb/templates/archweb-mirrorcheck.service.j2
@@ -6,8 +6,9 @@ After=network.target
 Type=oneshot
 User=archweb
 WorkingDirectory={{ archweb_dir }}
-ExecStart={{ archweb_dir }}/env/bin/python manage.py mirrorcheck --location 5
-ExecStart={{ archweb_dir}}/env/bin/python manage.py mirrorcheck --location 6
+{% for location in archweb_mirrorcheck_locations %}
+ExecStart={{ archweb_dir }}/env/bin/python manage.py mirrorcheck --location {{ location }}
+{% endfor %}
 Nice=5
 
 [Install]