From ca42dcf422c97af22ba30b554a05256c61825e35 Mon Sep 17 00:00:00 2001
From: amedvede <amedvede@redhat.com>
Date: Thu, 18 Jan 2024 20:19:49 +0100
Subject: [PATCH] bodhi: cleanup_changes_that_didnt_work

Signed-off-by: amedvede <amedvede@redhat.com>
---
 roles/bodhi2/base/templates/httpd.conf.j2     |  5 -----
 roles/bodhi2/base/templates/production.ini.j2 | 11 -----------
 2 files changed, 16 deletions(-)

diff --git a/roles/bodhi2/base/templates/httpd.conf.j2 b/roles/bodhi2/base/templates/httpd.conf.j2
index da1624667f..5bd0dff20c 100644
--- a/roles/bodhi2/base/templates/httpd.conf.j2
+++ b/roles/bodhi2/base/templates/httpd.conf.j2
@@ -48,11 +48,6 @@ MaxRequestWorkers 100
     ExpiresDefault "access plus 1 month"
     Header unset ETag
 </Location>
-{% if env == 'staging' %}
-<IfModule mod_headers.c>
-    Header set Access-Control-Allow-Origin "https://src.stg.fedoraproject.org"
-</IfModule>
-{% endif %}
 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
 CustomLog /httpdir/accesslog combined
 ErrorLog /httpdir/errorlog
diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index e2cf15f19b..2e8873c884 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -709,21 +709,10 @@ pyramid.default_locale_name = en
 
 pyramid.includes =
     pyramid_sawing
-    cornice
 pyramid_sawing.file = /etc/bodhi/logging.yaml
 
 debugtoolbar.hosts = 127.0.0.1 ::1
 
-##
-## CORS settings
-##
-{% if env == "staging" %}
-cors.policy.origins = https://src.stg.fedoraproject.org
-cors.policy.headers = Content-Type, Accept
-cors.policy.expose_headers = Content-Type, Accept
-cors.policy.methods = GET, OPTIONS
-cors.policy.max_age = 3600
-{% endif %}
 
 ##
 ## Database