From 4e95c76e0bf8e4355014c9c4111f5de74cc7fea9 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Tue, 27 Apr 2021 22:00:47 +0200
Subject: [PATCH] copr-dist-git: simplify cgitrc config

This is a missing step after:
https://pagure.io/copr/copr/c/2e64a15058b9484fd17047fa5667aac6c1034954
---
 .../copr/dist_git/files/copr-dist-git.hourly  | 11 ---
 roles/copr/dist_git/tasks/main.yml            |  8 --
 roles/copr/dist_git/templates/cgitrc          |  2 +-
 roles/copr/dist_git/templates/cgitrc.slow     | 85 -------------------
 4 files changed, 1 insertion(+), 105 deletions(-)
 delete mode 100755 roles/copr/dist_git/files/copr-dist-git.hourly
 delete mode 100644 roles/copr/dist_git/templates/cgitrc.slow

diff --git a/roles/copr/dist_git/files/copr-dist-git.hourly b/roles/copr/dist_git/files/copr-dist-git.hourly
deleted file mode 100755
index 3aae8ac219..0000000000
--- a/roles/copr/dist_git/files/copr-dist-git.hourly
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/bash
-
-# we need to optimize this
-exit 0
-
-(
-flock -n 9 || exit 1
-# ... commands executed under lock ...
-CGIT_CONFIG="/etc/cgitrc.slow"   /var/www/cgi-bin/cgit  --scan-path=/var/lib/dist-git/git >/var/cache/cgit/repo-list.rc.new 2>/dev/null && mv -f /var/cache/cgit/repo-list.rc.new /var/cache/cgit/repo-list.rc
-
-) 9>/var/lock/mylockfile
diff --git a/roles/copr/dist_git/tasks/main.yml b/roles/copr/dist_git/tasks/main.yml
index f2906819cd..efb3ae248f 100644
--- a/roles/copr/dist_git/tasks/main.yml
+++ b/roles/copr/dist_git/tasks/main.yml
@@ -84,17 +84,9 @@
   tags:
   - config
 
-- name: install /etc/cron.hourly/copr-dist-git cron job
-  copy: src="copr-dist-git.hourly" dest="/etc/cron.hourly/copr-dist-git" mode=755
-  tags:
-  - config
-
 - name: install cgitrc
   template: src="cgitrc" dest="/etc/cgitrc" owner=root group=root mode=0644
 
-- name: install cgitrc.slow
-  template: src="cgitrc.slow" dest="/etc/cgitrc.slow" owner=root group=root mode=0644
-
 - name: allow httpd to run cgit
   seboolean: name=httpd_enable_cgi state=true persistent=true
 
diff --git a/roles/copr/dist_git/templates/cgitrc b/roles/copr/dist_git/templates/cgitrc
index 1b5f96a313..9129a69652 100644
--- a/roles/copr/dist_git/templates/cgitrc
+++ b/roles/copr/dist_git/templates/cgitrc
@@ -81,5 +81,5 @@ source-filter=/usr/libexec/cgit/filters/syntax-highlighting.sh
 #repo.readme=info/web/about.html
 project-list=/var/lib/copr-dist-git/cgit_pkg_list
 #scan-path=/var/lib/dist-git/git
-include=/var/cache/cgit/repo-list.rc
+include=/var/cache/cgit/repo-configuration.rc
 clone-prefix=http://{{ dist_git_base_url }}/git
diff --git a/roles/copr/dist_git/templates/cgitrc.slow b/roles/copr/dist_git/templates/cgitrc.slow
deleted file mode 100644
index f06c932d61..0000000000
--- a/roles/copr/dist_git/templates/cgitrc.slow
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# See cgitrc(5) or /usr/share/doc/cgit-*/cgitrc.5.html for details
-#
-
-# Enable caching of up to 1000 output entries
-cache-dynamic-ttl=120
-cache-repo-ttl=120
-cache-root-ttl=120
-cache-scanrc-ttl=10
-cache-about-ttl=120
-cache-snapshot-ttl=120
-cache-size=100000
-
-# Specify some default clone prefixes
-#clone-prefix=git://example.com ssh://example.com/pub/git http://example.com/git
-
-# Specify the css url
-css=/cgit-data/cgit.css
-
-# Show extra links for each repository on the index page
-enable-index-links=1
-
-# Enable ASCII art commit history graph on the log pages
-enable-commit-graph=1
-
-# Show number of affected files per commit on the log pages
-enable-log-filecount=1
-
-# Show number of added/removed lines per commit on the log pages
-enable-log-linecount=1
-
-# Add a cgit favicon
-#favicon=/favicon.ico
-
-# Use a custom logo
-logo=/cgit-data/cgit.png
-
-# Enable statistics per week, month and quarter
-max-stats=quarter
-
-# Set the title and heading of the repository index page
-#root-title=example.com git repositories
-
-# Set a subheading for the repository index page
-#root-desc=tracking the foobar development
-
-# Include some more info about this site on the index page
-#root-readme=/var/www/html/about.html
-
-# Allow download of tar.gz, tar.bz2 and zip-files
-#snapshots=tar.gz tar.bz2 zip
-
-##
-## List of common mimetypes
-##
-
-mimetype.gif=image/gif
-mimetype.html=text/html
-mimetype.jpg=image/jpeg
-mimetype.jpeg=image/jpeg
-mimetype.pdf=application/pdf
-mimetype.png=image/png
-mimetype.svg=image/svg+xml
-
-# Enable syntax highlighting (requires the highlight package)
-#source-filter=/usr/libexec/cgit/filters/syntax-highlighting.sh
-
-##
-## List of repositories.
-## PS: Any repositories listed when section is unset will not be
-##     displayed under a section heading
-## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos')
-##      and included like this:
-##        include=/etc/cgitrepos
-##
-
-#repo.url=foo
-#repo.path=/var/lib/git/foo.git
-#repo.desc=the master foo repository
-#repo.owner=fooman@example.com
-#repo.readme=info/web/about.html
-project-list=/var/lib/copr-dist-git/cgit_pkg_list
-#scan-path=/var/lib/dist-git/git
-clone-prefix=http://copr-dist-git.fedorainfracloud.org/git
-scan-path=/var/lib/dist-git/git