From e6737f71d173badbc94bb67dbad53a14aea94ec6 Mon Sep 17 00:00:00 2001
From: Martin Sehnoutka <msehnout@redhat.com>
Date: Tue, 27 Jul 2021 10:18:19 +0200
Subject: [PATCH] test/cases/ostree*: remove mod_ssl configuration file

It clashes with osbuild-composer already running on port 443.
---
 test/cases/ostree-ng.sh | 5 +++++
 test/cases/ostree.sh    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/test/cases/ostree-ng.sh b/test/cases/ostree-ng.sh
index dbc01bcbe..5719af20d 100755
--- a/test/cases/ostree-ng.sh
+++ b/test/cases/ostree-ng.sh
@@ -243,6 +243,11 @@ check_result () {
 ###########################################################
 greenprint "🔧 Prepare edge prod repo"
 # Start prod repo web service
+# osbuild-composer-tests have mod_ssl as a dependency. The package installs
+# an example configuration which automatically enabled httpd on port 443, but
+# that one is already in use. Remove the default configuration as it is useless
+# anyway.
+sudo rm -f /etc/httpd/conf.d/ssl.conf
 sudo systemctl enable --now httpd.service
 
 # Have a clean prod repo
diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh
index 418331e5c..01ef9ba0e 100755
--- a/test/cases/ostree.sh
+++ b/test/cases/ostree.sh
@@ -277,6 +277,11 @@ build_image "$BLUEPRINT_FILE" ostree
 
 # Start httpd to serve ostree repo.
 greenprint "🚀 Starting httpd daemon"
+# osbuild-composer-tests have mod_ssl as a dependency. The package installs
+# an example configuration which automatically enabled httpd on port 443, but
+# that one is already in use. Remove the default configuration as it is useless
+# anyway.
+sudo rm -f /etc/httpd/conf.d/ssl.conf
 sudo systemctl start httpd
 
 # Download the image and extract tar into web server root folder.