Have MBS in same apache config as copr (later, ansible should add it there)

This commit is contained in:
Jakub Kadlčík 2017-01-20 09:48:03 +01:00 committed by Miroslav Suchý
parent 8e945d2d4c
commit 4f60d42653
2 changed files with 17 additions and 51 deletions

View file

@ -6,15 +6,30 @@ Alias /robots.txt /var/www/html/robots.txt
<VirtualHost *:80>
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
<Location /module-build-service>
WSGIProcessGroup module-build-service
</Location>
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
<Location />
WSGIProcessGroup 127.0.0.1
</Location>
RedirectMatch "/coprs/(.*)/(.*)/repo/fedora-rawhide/(.*)$" "/coprs/$1/$2/repo/fedora-26/$3"

View file

@ -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
<VirtualHost *:443>
#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
<Directory /usr/share/copr>
WSGIApplicationGroup %{GLOBAL}
Require all granted
</Directory>
</VirtualHost>
<IfModule mod_status.c>
ExtendedStatus On
<Location /server-status>
SetHandler server-status
Require all denied
Require host localhost .redhat.com
</Location>
</IfModule>
<IfModule mpm_prefork_module>
StartServers 8
MinSpareServers 8
MaxSpareServers 20
MaxClients 50
MaxRequestsPerChild 10000
</IfModule>