From 55c9fb266b5283935d45c97fccc8c9657863c57b Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Sat, 13 Apr 2019 15:56:51 +0200 Subject: [PATCH] Remove cgit from dist-git Signed-off-by: Patrick Uiterwijk --- playbooks/groups/pkgs.yml | 3 -- roles/distgit/files/cgit.conf | 8 ---- roles/distgit/files/cgitrc | 74 ------------------------------ roles/distgit/files/robots-src.txt | 3 -- roles/distgit/files/suexec-cgit.sh | 2 - roles/distgit/tasks/main.yml | 35 -------------- 6 files changed, 125 deletions(-) delete mode 100644 roles/distgit/files/cgit.conf delete mode 100644 roles/distgit/files/cgitrc delete mode 100644 roles/distgit/files/suexec-cgit.sh diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index f0c0412185..ee820b93b7 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -32,9 +32,6 @@ baseurl: "fedora01.rpms.stg.fedoraproject.org:{{repoSpanner_rpms_http}}", when: env == "staging" } - gitolite/base - - cgit/base - - cgit/clean_lock_cron - - cgit/make_pkgs_list - gitolite/check_fedmsg_hooks - { role: git/make_checkout_seed, when: env != "staging" } - git/hooks diff --git a/roles/distgit/files/cgit.conf b/roles/distgit/files/cgit.conf deleted file mode 100644 index a4270e084f..0000000000 --- a/roles/distgit/files/cgit.conf +++ /dev/null @@ -1,8 +0,0 @@ -#RedirectMatch permanent "/cgit/rpms/$" "/" -#Redirect /cgit/rpms/ /rpms/ -#Redirect permanent /cgit/ / -Alias /cgit-data /usr/share/cgit -ScriptAlias /cgit /var/www/bin/suexec-cgit.conf - - Require all granted - diff --git a/roles/distgit/files/cgitrc b/roles/distgit/files/cgitrc deleted file mode 100644 index fb1c5db7c7..0000000000 --- a/roles/distgit/files/cgitrc +++ /dev/null @@ -1,74 +0,0 @@ -# -# See cgitrc(5) or /usr/share/doc/cgit-*/cgitrc.5.html for details -# - -# Enable caching of up to 1000 output entries -cache-size=1000 - -# Specify some default clone prefixes -clone-prefix=https://src.fedoraproject.org/git - -# Some header information to throw at the top of each page (fedmenu). -header=/usr/share/cgit/cgit-header-fedora.html - -# 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=Fedora Project Packages 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.xz 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 -#email-filter=lua:/usr/libexec/cgit/filters/email-libravatar-korg.lua - - -## -## 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: -project-list=/srv/git/pkgs-git-repos-list -scan-path=/srv/git/repositories diff --git a/roles/distgit/files/robots-src.txt b/roles/distgit/files/robots-src.txt index 437658ade1..e2524e9056 100644 --- a/roles/distgit/files/robots-src.txt +++ b/roles/distgit/files/robots-src.txt @@ -1,6 +1,3 @@ -User-agent: * -Disallow: /cgit/ - User-agent: * Disallow: /git/ diff --git a/roles/distgit/files/suexec-cgit.sh b/roles/distgit/files/suexec-cgit.sh deleted file mode 100644 index f5b9ccfe92..0000000000 --- a/roles/distgit/files/suexec-cgit.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -exec sudo -E -u apache /var/www/cgi-bin/cgit diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml index 4648f8ca4b..62c14d71b7 100644 --- a/roles/distgit/tasks/main.yml +++ b/roles/distgit/tasks/main.yml @@ -45,7 +45,6 @@ group=packager mode=0755 with_items: - - cgit - gitolite - upload tags: @@ -351,40 +350,6 @@ - distgit - config -# -- CGit ------------------------------------------------ -# This is the pretty web view of the repositories, using CGit. -- name: install the prod cgitrc file - copy: src=cgitrc dest=/etc/cgitrc - tags: - - distgit - - cgit - notify: - - reload httpd - -- name: install our custom header for cgit - template: src=cgit-header.html dest=/usr/share/cgit/cgit-header-fedora.html - tags: - - distgit - - cgit - notify: - - reload httpd - -- name: Remove the old cgit related redirect config - file: path=/etc/httpd/conf.d/dist-git/redirect.conf state=absent - tags: - - distgit - - cgit - notify: - - reload httpd - -- name: install the CGit-related httpd main config - copy: src=cgit.conf dest=/etc/httpd/conf.d/cgit.conf - tags: - - distgit - - cgit - notify: - - reload httpd - # -- Lookaside Cache ------------------------------------- # This is the annex to Dist Git, where we host source tarballs. - name: install the Lookaside Cache httpd configs