From 3acb75215d4ce3cea34fe9c3c1cba20251e3fc1e Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 4 Aug 2020 14:41:54 +0200 Subject: [PATCH] ci_resultsdb: remove files that are no longer used Signed-off-by: Pierre-Yves Chibon --- roles/ci_resultsdb/templates/cert.conf | 19 --------- .../templates/ci-resultsdb-listener.py | 11 ----- roles/ci_resultsdb/templates/endpoints.py | 41 ------------------- roles/ci_resultsdb/templates/settings.py | 13 ------ 4 files changed, 84 deletions(-) delete mode 100644 roles/ci_resultsdb/templates/cert.conf delete mode 100644 roles/ci_resultsdb/templates/ci-resultsdb-listener.py delete mode 100644 roles/ci_resultsdb/templates/endpoints.py delete mode 100644 roles/ci_resultsdb/templates/settings.py diff --git a/roles/ci_resultsdb/templates/cert.conf b/roles/ci_resultsdb/templates/cert.conf deleted file mode 100644 index 1e5e4e8572..0000000000 --- a/roles/ci_resultsdb/templates/cert.conf +++ /dev/null @@ -1,19 +0,0 @@ - - ServerName resultsdb.ci.centos.org - RewriteEngine on - RewriteRule ^/\.well-known/(.*) /srv/web/acme-challenge/.well-known/$1 [L] - - - - ServerName resultsdb.ci.centos.org - - SSLEngine on - SSLCertificateFile /etc/letsencrypt/live/resultsdb.ci.centos.org/cert.pem - SSLCertificateKeyFile /etc/letsencrypt/live/resultsdb.ci.centos.org/privkey.pem - SSLCertificateChainFile /etc/letsencrypt/live/resultsdb.ci.centos.org/fullchain.pem - SSLHonorCipherOrder On - SSLCipherSuite RC4-SHA:AES128-SHA:ALL:!ADH:!EXP:!LOW:!MD5:!SSLV2:!NULL - SSLProtocol ALL -SSLv2 - - - diff --git a/roles/ci_resultsdb/templates/ci-resultsdb-listener.py b/roles/ci_resultsdb/templates/ci-resultsdb-listener.py deleted file mode 100644 index 0ffe65031d..0000000000 --- a/roles/ci_resultsdb/templates/ci-resultsdb-listener.py +++ /dev/null @@ -1,11 +0,0 @@ -config = { - 'resultsdb_listener.pipelinepackageignoreconsumer.enabled': True, - 'resultsdb_listener.pipelineimagecompleteconsumer.enabled': True, - 'resultsdb_listener.pipelinecomposecompleteconsumer.enabled': True, - 'resultsdb_listener.pipelinepackagecompleteconsumer.enabled': True, - 'resultsdb_listener.pipelineimagetestsmokecompleteconsumer.enabled': True, - 'resultsdb_listener.pipelinepackagetestfunctionalcompleteconsumer.enabled': True, - 'resultsdb_listener.pipelinecomposetestintegrationcompleteconsumer.enabled': True, - 'resultsdb_listener.pipelinecompleteconsumer.enabled': True, - 'resultsdb_listener.enabled': True, -} diff --git a/roles/ci_resultsdb/templates/endpoints.py b/roles/ci_resultsdb/templates/endpoints.py deleted file mode 100644 index 22258c0c26..0000000000 --- a/roles/ci_resultsdb/templates/endpoints.py +++ /dev/null @@ -1,41 +0,0 @@ -# This file is part of fedmsg. -# Copyright (C) 2012 Red Hat, Inc. -# -# fedmsg is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# fedmsg is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with fedmsg; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Authors: Ralph Bean -# -config = dict( - # This is a dict of possible addresses from which fedmsg can send - # messages. fedmsg.init(...) requires that a 'name' argument be passed - # to it which corresponds with one of the keys in this dict. - endpoints={ - # These are here so your local box can listen to the upstream - # infrastructure's bus. Cool, right? :) - "fedora-infrastructure": [ - "tcp://hub.fedoraproject.org:9940", - "tcp://fedmsg-relay.ci.centos.org:9940", - # "tcp://stg.fedoraproject.org:9940", - ], - # "debian-infrastructure": [ - # "tcp://fedmsg.olasd.eu:9940", - # ], - # "anitya-public-relay": [ - # "tcp://release-monitoring.org:9940", - # ], - }, - status_directory='/var/run/fedmsg/status', - datagrepper_url="https://apps.fedoraproject.org/datagrepper/raw", -) diff --git a/roles/ci_resultsdb/templates/settings.py b/roles/ci_resultsdb/templates/settings.py deleted file mode 100644 index 4df71717a6..0000000000 --- a/roles/ci_resultsdb/templates/settings.py +++ /dev/null @@ -1,13 +0,0 @@ -SECRET_KEY = '{{ resultsdb_secret_key }}' -SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ resultsdb_db_user }}:{{ resultsdb_db_password }}@{{ resultsdb_db_host }}:{{ resultsdb_db_port }}/{{ resultsdb_db_name }}' -FILE_LOGGING = False -LOGFILE = '/var/log/resultsdb/resultsdb.log' -SYSLOG_LOGGING = False -STREAM_LOGGING = True - -MESSAGE_BUS_PUBLISH = False -MESSAGE_BUS_PUBLISH_TASKOTRON = False - -MESSAGE_BUS_PLUGIN = 'fedmsg' -MESSAGE_BUS_KWARGS = {'modname': 'resultsdb'} -