Merge pull request #26 from brianhlin/fixup-el9-testing-image

Fixup default apache config for the testing image (INF-1211)

Author: brianhlin

Dockerfile.testing

@@ -25,6 +25,9 @@ RUN \
 COPY registry run_local.sh requirements.txt /opt/registry/
 RUN pip3 install -U pip && pip3 install -r /opt/registry/requirements.txt
 
+# Use our weird grid-security cert/key location
+RUN rm /etc/httpd/conf.d/ssl.conf
+
 COPY register.py /usr/bin
 COPY supervisor-apache.conf /etc/supervisord.d/40-apache.conf
 COPY examples/apache.conf /etc/httpd/conf.d/

examples/apache.conf

@@ -1,5 +1,7 @@
+ServerName os-registry.osgdev.chtc.io
+Listen 443
+
 <VirtualHost *:443>
-  ServerName os-registry.osgdev.chtc.io
   ServerAdmin example@morgridge.org
 
   # This is the OIDC callback path