From 215632b518e832acf65991b6d59d2a396101d437 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Jul 31 2017 08:58:13 +0000 Subject: [PATCH 1/2] Update the vagrant env to add the worker service. This commit adds the pagure-worker service to the vagrant environment It also enable the systemd services. Signed-off-by: Clement Verna --- diff --git a/dev/ansible/roles/pagure-dev/files/pagure.service b/dev/ansible/roles/pagure-dev/files/pagure.service index 7999bc9..99cc222 100644 --- a/dev/ansible/roles/pagure-dev/files/pagure.service +++ b/dev/ansible/roles/pagure-dev/files/pagure.service @@ -4,7 +4,7 @@ After=network.target [Service] Environment="PAGURE_CONFIG=/home/vagrant/pagure.cfg" -ExecStart=/home/vagrant/.virtualenvs/python2-pagure/bin/python %h/devel/runserver.py --host 0.0.0.0 +ExecStart=/home/vagrant/.virtualenvs/python2-pagure/bin/python %h/devel/runserver.py --host 0.0.0.0 --debug 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 new file mode 100644 index 0000000..5830e31 --- /dev/null +++ b/dev/ansible/roles/pagure-dev/files/pagure_worker.service @@ -0,0 +1,13 @@ +[Unit] +Description=Pagure worker for backend git interaction +After=redis.target +Documentation=https://pagure.io/pagure + +[Service] +ExecStart=/usr/bin/celery worker -A pagure.lib.tasks --loglevel=info --autoreload +Environment="PAGURE_CONFIG=/home/vagrant/pagure.cfg" +Type=simple +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/dev/ansible/roles/pagure-dev/tasks/main.yml b/dev/ansible/roles/pagure-dev/tasks/main.yml index 64799fb..a793f92 100644 --- a/dev/ansible/roles/pagure-dev/tasks/main.yml +++ b/dev/ansible/roles/pagure-dev/tasks/main.yml @@ -174,3 +174,18 @@ - pagure_ci.service - pagure_ev.service - pagure_webhook.service + - pagure_worker.service + +- name: Enable the Pagure systemd services + become: False + systemd: + name: "{{ item }}" + enabled: True + user: yes + with_items: + - pagure + - pagure-docs + - pagure_ci + - pagure_ev + - pagure_webhook + - pagure_worker From e0a259de792db2566173b7f783e2382fd29b5f02 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Jul 31 2017 08:58:13 +0000 Subject: [PATCH 2/2] Make the pagure service run with debug options Signed-off-by: Clement Verna --- diff --git a/dev/ansible/roles/pagure-dev/files/bashrc b/dev/ansible/roles/pagure-dev/files/bashrc index 4b7ac84..eb3b474 100644 --- a/dev/ansible/roles/pagure-dev/files/bashrc +++ b/dev/ansible/roles/pagure-dev/files/bashrc @@ -16,22 +16,22 @@ export PAGURE_CONFIG=~/pagure.cfg pstart (){ systemctl --user start pagure.service pagure-docs.service pagure_ci.service\ - pagure_ev.service pagure_webhook.service + pagure_ev.service pagure_webhook.service pagure_worker.service echo 'The application is running on http://localhost:5000/' } pstop (){ systemctl --user stop pagure.service pagure-docs.service pagure_ci.service\ - pagure_ev.service pagure_webhook.service + pagure_ev.service pagure_webhook.service pagure_worker.service } prestart (){ systemctl --user restart pagure.service pagure-docs.service pagure_ci.service\ - pagure_ev.service pagure_webhook.service + pagure_ev.service pagure_webhook.service pagure_worker.service echo 'The application is running on http://localhost:5000/' } pstatus (){ systemctl --user status pagure.service pagure-docs.service pagure_ci.service\ - pagure_ev.service pagure_webhook.service + pagure_ev.service pagure_webhook.service pagure_worker.service }