diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 63fb2460da..11582db36f 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -742,13 +742,6 @@ tags: - odcs - - role: httpd/reverseproxy - website: freshmaker.fedoraproject.org - destname: freshmaker - proxyurl: http://localhost:10067 - tags: - - freshmaker - - role: httpd/reverseproxy website: greenwave.fedoraproject.org destname: greenwave diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index c87677f638..d28c5a7e10 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -898,13 +898,6 @@ cert_name: "{{wildcard_cert_name}}" tags: odcs - - role: httpd/website - site_name: freshmaker.fedoraproject.org - sslonly: true - server_aliases: [freshmaker.stg.fedoraproject.org] - cert_name: "{{wildcard_cert_name}}" - tags: freshmaker - - role: httpd/website site_name: greenwave.fedoraproject.org sslonly: true diff --git a/roles/epylog/files/merged/weed_local.cf b/roles/epylog/files/merged/weed_local.cf index aec45ae8ef..97e9db9271 100644 --- a/roles/epylog/files/merged/weed_local.cf +++ b/roles/epylog/files/merged/weed_local.cf @@ -76,7 +76,6 @@ freshclam.*:.*is up to date.* freshclam.*:.*updated.* freshclam.*: Database updated.* freshclam.*: ClamAV update process started -freshmaker.* git-daemon.*: Connection from.* git-daemon.*: Connection reset by peer git-daemon.*: .* does not appear to be a git repository diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 42d2149fbe..b88b66f88a 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -439,15 +439,6 @@ backend odcs-backend server odcs-frontend01 odcs-frontend01:80 check inter 20s rise 2 fall 3 option httpchk GET /api/1/composes/ -frontend freshmaker-frontend - bind 0.0.0.0:10067 - default_backend freshmaker-backend - -backend freshmaker-backend - balance hdr(appserver) - server freshmaker-frontend01 freshmaker-frontend01:80 check inter 20s rise 2 fall 3 - option httpchk GET /api/1/builds/ - {% if env == "staging" %} frontend copr-frontend bind 0.0.0.0:10070 diff --git a/roles/ipsilon/files/oidc_scopes/freshmaker.py b/roles/ipsilon/files/oidc_scopes/freshmaker.py deleted file mode 100644 index ac1b44fef7..0000000000 --- a/roles/ipsilon/files/oidc_scopes/freshmaker.py +++ /dev/null @@ -1,14 +0,0 @@ -from __future__ import absolute_import - -from ipsilon.providers.openidc.plugins.common import OpenidCExtensionBase - - -class OpenidCExtension(OpenidCExtensionBase): - name = 'freshmaker' - display_name = 'Freshmaker Rebuilds' - scopes = { - 'https://pagure.io/freshmaker/submit-build': { - 'display_name': 'Permission to submit manual triggers of rebuilds', - 'claims': [], - }, - } diff --git a/roles/ipsilon/tasks/main.yml b/roles/ipsilon/tasks/main.yml index ab2f0a73cc..ab94dab8b7 100644 --- a/roles/ipsilon/tasks/main.yml +++ b/roles/ipsilon/tasks/main.yml @@ -48,7 +48,6 @@ - waiverdb - odcs - wiki - - freshmaker - src - fpdc notify: diff --git a/roles/ipsilon/templates/configuration.conf b/roles/ipsilon/templates/configuration.conf index 5c0a645a57..be676b0e74 100644 --- a/roles/ipsilon/templates/configuration.conf +++ b/roles/ipsilon/templates/configuration.conf @@ -23,9 +23,9 @@ global enabled=allow global enabled=openid,saml2,openidc {% if env == "production" %} -openidc enabled extensions=fedora-account,mbs,beaker,waiverdb,odcs,wiki,freshmaker,src,fpdc,kerneltest +openidc enabled extensions=fedora-account,mbs,beaker,waiverdb,odcs,wiki,src,fpdc,kerneltest {% else %} -openidc enabled extensions=fedora-account,mbs,beaker,waiverdb,odcs,wiki,freshmaker,src,modernpaste,fpdc,kerneltest +openidc enabled extensions=fedora-account,mbs,beaker,waiverdb,odcs,wiki,src,modernpaste,fpdc,kerneltest {% endif %} {% if env == 'staging' %} diff --git a/roles/openshift-apps/ipsilon/vars/build.yml b/roles/openshift-apps/ipsilon/vars/build.yml index 5992ad823c..28384546a8 100644 --- a/roles/openshift-apps/ipsilon/vars/build.yml +++ b/roles/openshift-apps/ipsilon/vars/build.yml @@ -6,7 +6,6 @@ oidc_scope_filenames: - waiverdb - odcs - wiki -- freshmaker - src - fpdc - kerneltest