diff --git a/roles/copr/frontend/tasks/main.yml b/roles/copr/frontend/tasks/main.yml index d3b43db0c3..681c894c4e 100644 --- a/roles/copr/frontend/tasks/main.yml +++ b/roles/copr/frontend/tasks/main.yml @@ -17,7 +17,7 @@ - config - name: copy apache files to conf.d (templates) - template: src=coprs.conf dest=/etc/httpd/conf.d/coprs.conf + template: src=httpd.conf dest=/etc/httpd/conf.d/coprs.conf notify: - reload httpd tags: diff --git a/roles/copr/frontend/templates/coprs.conf b/roles/copr/frontend/templates/httpd.conf similarity index 56% rename from roles/copr/frontend/templates/coprs.conf rename to roles/copr/frontend/templates/httpd.conf index 5f992a9ca1..eaed6e248e 100644 --- a/roles/copr/frontend/templates/coprs.conf +++ b/roles/copr/frontend/templates/httpd.conf @@ -1,8 +1,3 @@ -NameVirtualHost *:80 -LoadModule wsgi_module modules/mod_wsgi.so -WSGISocketPrefix /var/run/wsgi -Alias /robots.txt /var/www/html/robots.txt - WSGIDaemonProcess 127.0.0.1 user=copr-fe group=copr-fe threads=15 display-name=other maximum-requests=8000 graceful-timeout=20 WSGIDaemonProcess api user=copr-fe group=copr-fe threads=15 display-name=api maximum-requests=8000 graceful-timeout=20 WSGIDaemonProcess backend user=copr-fe group=copr-fe threads=15 display-name=backend maximum-requests=8000 graceful-timeout=20 @@ -10,33 +5,17 @@ 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 maximum-requests=8000 graceful-timeout=20 WSGIScriptAlias / /usr/share/copr/coprs_frontend/application - - ServerName copr.fedorainfracloud.org - ServerAlias copr-fe.cloud.fedoraproject.org - WSGIPassAuthorization On +ServerName {{ inventory_hostname }} +WSGIPassAuthorization On - - WSGIProcessGroup 127.0.0.1 - - - #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 + + WSGIProcessGroup 127.0.0.1 - + + + WSGIApplicationGroup %{GLOBAL} + Require all granted + StartServers 8