diff --git a/roles/copr/frontend/files/httpd/coprs.conf b/roles/copr/frontend/files/httpd/coprs.conf index 8c906d14cb..fca4120950 100644 --- a/roles/copr/frontend/files/httpd/coprs.conf +++ b/roles/copr/frontend/files/httpd/coprs.conf @@ -6,15 +6,30 @@ Alias /robots.txt /var/www/html/robots.txt ServerName copr.fedorainfracloud.org ServerAlias copr-fe.cloud.fedoraproject.org - WSGIPassAuthorization On + + + # Needs to be above WSGIScriptAlias / + # @TODO With this configuration it needs to be accessed via [1] instead of [2] + # [1] http://127.0.0.1:8080/module-build-service/module-build-service/1/module-builds/ + # [2] http://127.0.0.1:8080/module-build-service/1/module-builds/ + + WSGIDaemonProcess module-build-service user=mbs group=mbs threads=15 display-name=module-build-service + WSGIScriptAlias /module-build-service /usr/share/copr/coprs_frontend/mbs + + WSGIProcessGroup module-build-service + + + WSGIDaemonProcess 127.0.0.1 user=copr-fe group=copr-fe threads=15 display-name=other WSGIDaemonProcess api user=copr-fe group=copr-fe threads=15 display-name=api WSGIDaemonProcess backend user=copr-fe group=copr-fe threads=15 display-name=backend WSGIDaemonProcess stats user=copr-fe group=copr-fe threads=15 display-name=stats WSGIDaemonProcess tmp user=copr-fe group=copr-fe threads=15 display-name=tmp WSGIScriptAlias / /usr/share/copr/coprs_frontend/application - WSGIProcessGroup 127.0.0.1 + + WSGIProcessGroup 127.0.0.1 + RedirectMatch "/coprs/(.*)/(.*)/repo/fedora-rawhide/(.*)$" "/coprs/$1/$2/repo/fedora-26/$3" diff --git a/roles/copr/mbs/files/httpd/mbs.conf b/roles/copr/mbs/files/httpd/mbs.conf deleted file mode 100644 index ead1e54ad1..0000000000 --- a/roles/copr/mbs/files/httpd/mbs.conf +++ /dev/null @@ -1,49 +0,0 @@ -NameVirtualHost *:443 -LoadModule wsgi_module modules/mod_wsgi.so -WSGISocketPrefix /var/run/wsgi -#Alias /robots.txt /var/www/html/robots.txt - - - #ServerName copr.fedorainfracloud.org/module-build-service - #ServerAlias copr-fe.cloud.fedoraproject.org/module-build-service - - ServerName module-build-service - ServerAlias module-build-service - - WSGIPassAuthorization On - #WSGIDaemonProcess 127.0.0.1 user=mbs group=mbs threads=15 display-name=other - WSGIDaemonProcess module-build-service user=mbs group=mbs threads=15 display-name=module-build-service - #WSGIScriptAlias / /usr/share/copr/coprs_frontend/application - #WSGIScriptAlias / /usr/bin/mbs-frontend - #WSGIScriptAlias / /usr/share/copr/coprs_frontend/mbs - WSGIScriptAlias /module-build-service /usr/share/copr/coprs_frontend/mbs - WSGIProcessGroup 127.0.0.1/module-build-service - - - #ErrorLog logs/error_coprs - #CustomLog logs/access_coprs common - - - WSGIApplicationGroup %{GLOBAL} - Require all granted - - - - - -ExtendedStatus On - - - SetHandler server-status - Require all denied - Require host localhost .redhat.com - - - - - StartServers 8 - MinSpareServers 8 - MaxSpareServers 20 - MaxClients 50 - MaxRequestsPerChild 10000 -