From dbfde4a19682cac668ca6fa354dd1aa5bdc3dd0b Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Dec 14 2020 16:21:29 +0000
Subject: Port pagure to a F33-based vagrant image for development


This commit basically moves the Vagrantfile example file
from Fedora 30 to Fedora 33, adjusts the python path from
python 3.7 to python 3.9 and change the order of the argument
to the celery CLI for the services.
This last one seems new compared to previous celery releases but
without it the services are no longer starting.

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/dev/Vagrantfile.example b/dev/Vagrantfile.example
index ce7254a..f5fec1a 100644
--- a/dev/Vagrantfile.example
+++ b/dev/Vagrantfile.example
@@ -4,8 +4,8 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
- config.vm.box_url = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-30-1.2.x86_64.vagrant-libvirt.box"
- config.vm.box = "f30-cloud-libvirt"
+ config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/33/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-33-1.2.x86_64.vagrant-libvirt.box"
+ config.vm.box = "f33-cloud-libvirt"
 
 
  # Forward traffic on the host to the development server on the guest
diff --git a/dev/ansible/roles/pagure-dev/files/pagure_authorized_keys_worker.service b/dev/ansible/roles/pagure-dev/files/pagure_authorized_keys_worker.service
index 296db92..8fd39da 100644
--- a/dev/ansible/roles/pagure-dev/files/pagure_authorized_keys_worker.service
+++ b/dev/ansible/roles/pagure-dev/files/pagure_authorized_keys_worker.service
@@ -4,7 +4,7 @@ After=redis.target
 Documentation=https://pagure.io/pagure
 
 [Service]
-ExecStart=celery worker -A pagure.lib.tasks --loglevel=info -c 1 -Q authorized_keys_queue
+ExecStart=celery -A pagure.lib.tasks worker --loglevel=info -c 1 -Q authorized_keys_queue
 Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg"
 Type=simple
 Restart=on-failure
diff --git a/dev/ansible/roles/pagure-dev/files/pagure_ci.service b/dev/ansible/roles/pagure-dev/files/pagure_ci.service
index 24112c5..408236b 100644
--- a/dev/ansible/roles/pagure-dev/files/pagure_ci.service
+++ b/dev/ansible/roles/pagure-dev/files/pagure_ci.service
@@ -5,7 +5,7 @@ Documentation=https://pagure.io/pagure
 
 [Service]
 Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg"
-ExecStart=celery worker -A pagure.lib.tasks --loglevel=info -Q pagure_ci
+ExecStart=celery -A pagure.lib.tasks worker --loglevel=info -Q pagure_ci
 Type=simple
 User=git
 Group=git
diff --git a/dev/ansible/roles/pagure-dev/files/pagure_webhook.service b/dev/ansible/roles/pagure-dev/files/pagure_webhook.service
index 997e515..3c14cd3 100644
--- a/dev/ansible/roles/pagure-dev/files/pagure_webhook.service
+++ b/dev/ansible/roles/pagure-dev/files/pagure_webhook.service
@@ -5,7 +5,7 @@ Documentation=https://pagure.io/pagure
 
 [Service]
 Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg"
-ExecStart=celery worker -A pagure.lib.tasks --loglevel=info -Q pagure_webhook
+ExecStart=celery -A pagure.lib.tasks worker --loglevel=info -Q pagure_webhook
 Type=simple
 User=git
 Group=git
diff --git a/dev/ansible/roles/pagure-dev/files/pagure_worker.service b/dev/ansible/roles/pagure-dev/files/pagure_worker.service
index d0bed44..d433318 100644
--- a/dev/ansible/roles/pagure-dev/files/pagure_worker.service
+++ b/dev/ansible/roles/pagure-dev/files/pagure_worker.service
@@ -5,7 +5,7 @@ Documentation=https://pagure.io/pagure
 
 [Service]
 Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg"
-ExecStart=celery worker -A pagure.lib.tasks --loglevel=info
+ExecStart=celery -A pagure.lib.tasks worker --loglevel=info
 Type=simple
 User=git
 Group=git
diff --git a/dev/ansible/roles/pagure-dev/tasks/main.yml b/dev/ansible/roles/pagure-dev/tasks/main.yml
index f371973..88abe71 100644
--- a/dev/ansible/roles/pagure-dev/tasks/main.yml
+++ b/dev/ansible/roles/pagure-dev/tasks/main.yml
@@ -62,13 +62,13 @@
 
 - name: Create the folder where we'll place the symbolic link for pagure
   file:
-    path: /usr/local/lib/python3.7/site-packages/
+    path: /usr/local/lib/python3.9/site-packages/
     state: directory
 
 - name: Create symbolic link for pagure to be in the python path
   file:
     src: /srv/pagure/pagure
-    dest: /usr/local/lib/python3.7/site-packages/pagure
+    dest: /usr/local/lib/python3.9/site-packages/pagure
     state: link
 
 - name: Create symbolic link for python to be py3 by default