diff --git a/roles/copr/frontend/files/httpd/coprs.conf b/roles/copr/frontend/files/httpd/coprs.conf index 8d89bfde61..62ec6cf81a 100644 --- a/roles/copr/frontend/files/httpd/coprs.conf +++ b/roles/copr/frontend/files/httpd/coprs.conf @@ -3,7 +3,8 @@ LoadModule wsgi_module modules/mod_wsgi.so WSGISocketPrefix /var/run/wsgi - ServerName copr-fe.cloud.fedoraproject.org + ServerName copr.fedorainfracloud.org + ServerAlias copr-fe.cloud.fedoraproject.org WSGIPassAuthorization On WSGIDaemonProcess 127.0.0.1 user=copr-fe group=copr-fe threads=15 display-name=other diff --git a/roles/copr/frontend/files/httpd/coprs_ssl.conf b/roles/copr/frontend/files/httpd/coprs_ssl.conf index da6975dd67..d29c105905 100644 --- a/roles/copr/frontend/files/httpd/coprs_ssl.conf +++ b/roles/copr/frontend/files/httpd/coprs_ssl.conf @@ -1,49 +1,3 @@ - - SSLEngine on - SSLProtocol all -SSLv2 -SSLv3 - # Use secure TLSv1.1 and TLSv1.2 ciphers - SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:RC4-SHA:AES128-SHA:HIGH:!aNULL:!MD5 - SSLHonorCipherOrder on - Header always add Strict-Transport-Security "max-age=15768000; preload" - - SSLCertificateFile /etc/pki/tls/certs/copr-fe.fedoraproject.org.crt - SSLCertificateKeyFile /etc/pki/tls/private/copr-fe.fedoraproject.org.key - SSLCertificateChainFile /etc/pki/tls/certs/DigiCertCA.crt - - ServerName copr-fe.cloud.fedoraproject.org:443 - - # Redirect once the other url is confirmed working - #Redirect 301 / https://copr.fedorainfracloud.org/ - WSGIPassAuthorization On - WSGIScriptAlias / /usr/share/copr/coprs_frontend/application - WSGIProcessGroup 127.0.0.1 - - - WSGIProcessGroup api - - - WSGIProcessGroup backend - - - WSGIProcessGroup stats - - - WSGIProcessGroup tmp - - - #ErrorLog logs/error_coprs - #CustomLog logs/access_coprs common - - - WSGIApplicationGroup %{GLOBAL} - Require all granted - - - RewriteEngine on - RewriteRule ^/coprs/sgallagh/cockpit-preview/repo/(.*)/.*\.repo$ /coprs/g/cockpit/cockpit-preview/repo/$1/ [R=301] - RewriteRule ^/coprs/sgallagh/cockpit-preview/(.*)$ /coprs/g/cockpit/cockpit-preview/$1 [R=301] - - SSLEngine on SSLProtocol all -SSLv2 -SSLv3 @@ -88,3 +42,22 @@ RewriteRule ^/coprs/sgallagh/cockpit-preview/(.*)$ /coprs/g/cockpit/cockpit-preview/$1 [R=301] + + SSLEngine on + SSLProtocol all -SSLv2 -SSLv3 + # Use secure TLSv1.1 and TLSv1.2 ciphers + SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:RC4-SHA:AES128-SHA:HIGH:!aNULL:!MD5 + SSLHonorCipherOrder on + Header always add Strict-Transport-Security "max-age=15768000; preload" + + SSLCertificateFile /etc/pki/tls/certs/copr-fe.fedoraproject.org.crt + SSLCertificateKeyFile /etc/pki/tls/private/copr-fe.fedoraproject.org.key + SSLCertificateChainFile /etc/pki/tls/certs/DigiCertCA.crt + + ServerName copr-fe.cloud.fedoraproject.org + ServerAlias copr.fedoraproject.org + + Redirect 302 / https://copr.fedorainfracloud.org/ + + +