From ce213161a32ccfde09f3b7a3a5d6f664cdb6225f Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Wed, 20 May 2020 16:24:45 +0200
Subject: [PATCH] distgit: adjust the list of packages to be installed in
 stg/rhel8 and drop gitolite there as well

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
---
 roles/distgit/tasks/main.yml | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml
index ec6420ae0d..f9deeff98f 100644
--- a/roles/distgit/tasks/main.yml
+++ b/roles/distgit/tasks/main.yml
@@ -15,6 +15,20 @@
   - python-fedmsg-genacls
   - /usr/sbin/semanage
   - mod_auth_openidc
+  when: env != "staging"
+  tags:
+  - distgit
+
+- name: install the needed packages
+  package: name={{item}} state=present
+  with_items:
+  - git
+  - httpd
+  - mod_ssl
+  - mod_auth_gssapi
+  - /usr/sbin/semanage
+  - mod_auth_openidc
+  when: env == "staging"
   tags:
   - distgit
 
@@ -192,6 +206,7 @@
 # This is the permission management for package maintainers, using Gitolite.
 - name: create the /var/log/gitolite directory
   file: path=/var/log/gitolite owner=root group=packager state=directory mode=2775
+  when: env != "staging"
   tags:
   - distgit
 
@@ -208,36 +223,42 @@
         group=gen-acls
         shell=/bin/bash
         home=/srv/git
+  when: env != "staging"
   tags:
   - distgit
 
 - name: create the /etc/gitolite/conf directory
   file: path=/etc/gitolite/conf owner=pagure group=pagure
         state=directory mode=0755
+  when: env != "staging"
   tags:
   - distgit
 
 - name: create the /etc/gitolite/logs directory
   file: path=/etc/gitolite/logs owner=pagure group=packager
         state=directory mode=0775
+  when: env != "staging"
   tags:
   - distgit
 
 - name: create the /etc/gitolite/local/VREF directory
   file: path=/etc/gitolite/local/VREF owner=pagure group=packager
         state=directory mode=0775
+  when: env != "staging"
   tags:
   - distgit
 
 - name: create /etc/gitolite/gitolite.rc
   template: src=gitolite.rc dest=/etc/gitolite/gitolite.rc
             owner=root group=root mode=0755
+  when: env != "staging"
   tags:
   - distgit
 
 - name: Create the rpms symlink (should not be needed, might still be used by some old scripts)
   command: ln -s /srv/git/repositories/ /srv/git/rpms
            creates=/srv/git/rpms
+  when: env != "staging"
   tags:
   - config
   - distgit
@@ -245,6 +266,7 @@
 - name: Create the gitolite.rc symlink
   command: ln -s /etc/gitolite/gitolite.rc /srv/git/.gitolite.rc
            creates=/srv/git/.gitolite.rc
+  when: env != "staging"
   tags:
   - config
   - distgit
@@ -252,6 +274,7 @@
 - name: Create the gitolite configuration symlink
   command: ln -s /etc/gitolite/ /srv/git/.gitolite
            creates=/srv/git/.gitolite
+  when: env != "staging"
   tags:
   - config
   - distgit
@@ -259,10 +282,12 @@
 - name: Copy in RepoAliases.header
   copy: src=RepoAliases.header dest=/etc/gitolite/RepoAliases.header
         owner=root group=root mode=0755
+  when: env != "staging"
 
 - name: Create the update-block-push-origin symlink
   command: ln -s /usr/share/git-core/update-block-push-origin /etc/gitolite/local/VREF/update-block-push-origin
            creates=/etc/gitolite/local/VREF/update-block-push-origin
+  when: env != "staging"
   tags:
   - config
   - distgit
@@ -270,6 +295,7 @@
 - name: install the fedmsg configuration
   template: src=fedmsg-genacls-config.py dest=/etc/fedmsg.d/genacls.py
             owner=root group=root mode=0644
+  when: env != "staging"
   tags:
   - distgit
 
@@ -278,6 +304,7 @@
   with_items:
     - /usr/local/bin/genacls.sh
     - /etc/cron.d/genacls.cron
+  when: env != "staging"
   tags:
   - config
   - distgit
@@ -296,6 +323,7 @@
 - name: Save the list the users having a shell access
   template: src=gitolite_admins dest=/etc/gitolite/admins
             owner=gen-acls group=packager mode=660
+  when: env != "staging"
   tags:
   - config
   - distgit
@@ -305,9 +333,11 @@
   with_items:
     - {name: /etc/gitolite/hooks, mode: 770, state: directory}
     - {name: /etc/gitolite/hooks/common, mode: 770, state: directory}
+  when: env != "staging"
 
 - name: Fix permissions on the Gitolite stuff (touch update if it does not exist)
   copy: content="" dest=/etc/gitolite/hooks/common/update force=no owner=root group=packager mode=0755
+  when: env != "staging"
   tags:
   - distgit
   - config
@@ -452,7 +482,7 @@
   - grokmirror
   - pkgs
 
-- name: run initial grokmirror run 
+- name: run initial grokmirror run
   command: /usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t /srv/git/repositories/ creates=/srv/git/grokmirror/manifest.js.gz
   tags:
   - grokmirror