From c9c2a6158ee48b68a7eb373c76f4095d6ac5d8a4 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Thu, 1 Oct 2020 16:07:04 +0200
Subject: [PATCH] pagure: clean up the pagure role as pagure01 is no longer
 real

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
---
 roles/pagure/frontend/tasks/main.yml | 66 +---------------------------
 1 file changed, 1 insertion(+), 65 deletions(-)

diff --git a/roles/pagure/frontend/tasks/main.yml b/roles/pagure/frontend/tasks/main.yml
index d0f9485217..781b6bd0e0 100644
--- a/roles/pagure/frontend/tasks/main.yml
+++ b/roles/pagure/frontend/tasks/main.yml
@@ -1,29 +1,5 @@
 ---
 # Configuration for the pagure webapp
-
-- name: install needed packages
-  package: name={{ item }} state=present
-  with_items:
-  - pagure
-  - pagure-ci
-  - pagure-ev
-  - pagure-loadjson
-  - pagure-logcom
-  - pagure-milters
-  - pagure-webhook
-  - python-psycopg2
-  - python2-pygments2
-  - redis
-  - libsemanage-python
-  - mod_ssl
-  - stunnel
-  # Use haveged to ensure the server keeps some entropy
-  - haveged
-  when: env != 'pagure-staging' and not inventory_hostname.startswith('pagure02')
-  tags:
-  - pagure
-  - packages
-
 - name: install needed packages
   package: name={{ item }} state=present
   with_items:
@@ -34,6 +10,7 @@
   - pagure-logcom
   - pagure-milters
   - pagure-webhook
+  - pagure-theme-pagureio
   - python3-psycopg2
   - python3-pygments
   - redis
@@ -43,16 +20,6 @@
   - stunnel
   # Use haveged to ensure the server keeps some entropy
   - haveged
-  when: env == 'pagure-staging' or inventory_hostname.startswith('pagure02')
-  tags:
-  - pagure
-  - packages
-
-- name: install needed packages
-  package: name={{ item }} state=present
-  when: env == 'pagure-staging' or inventory_hostname.startswith('pagure02')
-  with_items:
-  - pagure-theme-pagureio
   tags:
   - pagure
   - packages
@@ -101,18 +68,9 @@
   tags:
   - pagure
 
-
-- name: Create the "git" user
-  command: useradd --move-home --login git --home /srv/git/
-           creates=/srv/git/
-  when: env != 'pagure-staging' and not inventory_hostname.startswith('pagure02')
-  tags:
-  - pagure
-
 - name: Create the "git" user
   command: useradd --create-home --home-dir=/srv/git/  git
            creates=/srv/git/
-  when: env == 'pagure-staging' or inventory_hostname.startswith('pagure02')
   tags:
   - pagure
 
@@ -283,20 +241,10 @@
 
 # setup fedora-messaging
 
-- name: install fedora-messaging as a dependency
-  package: name={{ item }} state=present
-  with_items:
-  - python2-fedora-messaging
-  when: env != 'pagure-staging' and not inventory_hostname.startswith('pagure02')
-  tags:
-  - pagure
-  - fedora-messaging
-
 - name: install fedora-messaging as a dependency
   package: name={{ item }} state=present
   with_items:
   - python3-fedora-messaging
-  when: env == 'pagure-staging' or inventory_hostname.startswith('pagure02')
   tags:
   - pagure
   - fedora-messaging
@@ -399,23 +347,11 @@
   notify:
   - restart apache
 
-
-- name: create the database scheme
-  command: /usr/bin/python2 /usr/share/pagure/pagure_createdb.py
-  changed_when: "1 != 1"
-  environment:
-      PAGURE_CONFIG: /etc/pagure/pagure.cfg
-  when: env != 'pagure-staging' and not inventory_hostname.startswith('pagure02')
-  tags:
-  - web
-  - pagure
-
 - name: create the database scheme
   command: /usr/bin/python3 /usr/share/pagure/pagure_createdb.py
   changed_when: "1 != 1"
   environment:
       PAGURE_CONFIG: /etc/pagure/pagure.cfg
-  when: env == 'pagure-staging' or inventory_hostname.startswith('pagure02')
   tags:
   - web
   - pagure