From 8a029923a21107bd9f9d2e8e50cb9efdc8ee58d6 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Nov 09 2017 11:25:04 +0000
Subject: Fix the Vagrant setup


The Vagrant setup had a few issues:

* the services are now correctly enabled when provisioning (Fixes #2647)
* installed missing deps on trollius and trollius-redis (Fixes #2749)
* fixed pagure_webhook.service to run against the right python file
(Fixes #2749)
* removed the --autoreload flag from the celery command in
pagure_worker.service, as celery removed this flag (Fixes #2749)

Signed-off-by: Ryan Lerch <rlerch@redhat.com>

---

diff --git a/dev/ansible/roles/pagure-dev/files/pagure_webhook.service b/dev/ansible/roles/pagure-dev/files/pagure_webhook.service
index 601e296..8e46494 100644
--- a/dev/ansible/roles/pagure-dev/files/pagure_webhook.service
+++ b/dev/ansible/roles/pagure-dev/files/pagure_webhook.service
@@ -6,7 +6,7 @@ Documentation=https://pagure.io/pagure
 [Service]
 Environment="PAGURE_CONFIG=/home/vagrant/pagure.cfg"
 ExecStart=/home/vagrant/.virtualenvs/python2-pagure/bin/python \
-          /home/vagrant/devel/webhook-server/pagure-webhook-server.py
+          /home/vagrant/devel/pagure-webhook/pagure-webhook-server.py
 Type=simple
 
 [Install]
diff --git a/dev/ansible/roles/pagure-dev/files/pagure_worker.service b/dev/ansible/roles/pagure-dev/files/pagure_worker.service
index 5830e31..5cddaf8 100644
--- a/dev/ansible/roles/pagure-dev/files/pagure_worker.service
+++ b/dev/ansible/roles/pagure-dev/files/pagure_worker.service
@@ -4,7 +4,7 @@ After=redis.target
 Documentation=https://pagure.io/pagure
 
 [Service]
-ExecStart=/usr/bin/celery worker -A pagure.lib.tasks --loglevel=info --autoreload
+ExecStart=/usr/bin/celery worker -A pagure.lib.tasks --loglevel=info
 Environment="PAGURE_CONFIG=/home/vagrant/pagure.cfg"
 Type=simple
 Restart=on-failure
diff --git a/dev/ansible/roles/pagure-dev/tasks/main.yml b/dev/ansible/roles/pagure-dev/tasks/main.yml
index a793f92..c5ead65 100644
--- a/dev/ansible/roles/pagure-dev/tasks/main.yml
+++ b/dev/ansible/roles/pagure-dev/tasks/main.yml
@@ -88,6 +88,7 @@
     virtualenv_python: python2
   with_items:
     - "requirements.txt"
+    - "requirements-ev.txt"
     - "tests_requirements.txt"
 
 - name: Install Pagure package into a virtualenv
@@ -179,6 +180,7 @@
 - name: Enable the Pagure systemd services
   become: False
   systemd:
+    daemon_reload: yes
     name: "{{ item }}"
     enabled: True
     user: yes