Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Try fixing bodhi's httpd.conf again

Browse source 
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard 2019-11-12 13:11:22 +01:00 • committed by Pierre-Yves Chibon
parent ac90823ed6
commit fbdcf1292f
1 changed files with 69 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

113
roles/bodhi2/base/templates/httpd.conf.j2
View file

@ -1,67 +1,70 @@
Listen 0.0.0.0:8080 Listen 0.0.0.0:8080
ServerRoot "/httpdir" ServerRoot "/httpdir"
PidFile "/httpdir/httpd.pid" PidFile "/httpdir/httpd.pid"
LoadModule authn_file_module modules/mod_authn_file.so LoadModule authn_file_module modules/mod_authn_file.so
LoadModule authn_anon_module modules/mod_authn_anon.so LoadModule authn_anon_module modules/mod_authn_anon.so
LoadModule authz_user_module modules/mod_authz_user.so LoadModule authz_user_module modules/mod_authz_user.so
LoadModule authz_host_module modules/mod_authz_host.so LoadModule authz_host_module modules/mod_authz_host.so
LoadModule include_module modules/mod_include.so LoadModule include_module modules/mod_include.so
LoadModule log_config_module modules/mod_log_config.so LoadModule log_config_module modules/mod_log_config.so
LoadModule env_module modules/mod_env.so LoadModule env_module modules/mod_env.so
LoadModule ext_filter_module modules/mod_ext_filter.so LoadModule ext_filter_module modules/mod_ext_filter.so
LoadModule expires_module modules/mod_expires.so LoadModule expires_module modules/mod_expires.so
LoadModule headers_module modules/mod_headers.so LoadModule headers_module modules/mod_headers.so
LoadModule mime_module modules/mod_mime.so LoadModule mime_module modules/mod_mime.so
LoadModule status_module modules/mod_status.so LoadModule status_module modules/mod_status.so
LoadModule negotiation_module modules/mod_negotiation.so LoadModule negotiation_module modules/mod_negotiation.so
LoadModule dir_module modules/mod_dir.so LoadModule dir_module modules/mod_dir.so
LoadModule alias_module modules/mod_alias.so LoadModule alias_module modules/mod_alias.so
LoadModule rewrite_module modules/mod_rewrite.so LoadModule rewrite_module modules/mod_rewrite.so
LoadModule version_module modules/mod_version.so LoadModule version_module modules/mod_version.so
LoadModule wsgi_module modules/mod_wsgi_python3.so LoadModule wsgi_module modules/mod_wsgi_python3.so
LoadModule authn_core_module modules/mod_authn_core.so LoadModule authn_core_module modules/mod_authn_core.so
LoadModule authz_core_module modules/mod_authz_core.so LoadModule authz_core_module modules/mod_authz_core.so
LoadModule unixd_module modules/mod_unixd.so LoadModule unixd_module modules/mod_unixd.so
LoadModule mpm_event_module modules/mod_mpm_event.so LoadModule mpm_event_module modules/mod_mpm_event.so
StartServers 20 StartServers 20
ServerLimit 100 ServerLimit 100
MaxRequestsPerChild 2000 MaxRequestsPerChild 2000
MaxRequestWorkers 100 MaxRequestWorkers 100
<Directory "/usr/share/doc/bodhi-docs/html/"> <Directory "/usr/share/doc/bodhi-docs/html/">
AllowOverride None AllowOverride None
Require all granted Require all granted
</Directory> </Directory>
<Directory "/usr/lib/python3.7/site-packages/bodhi/server/static/"> <Directory "/usr/lib/python3.7/site-packages/bodhi/server/static/">
AllowOverride None AllowOverride None
Require all granted Require all granted
</Directory> </Directory>
<Location /> <Location />
Require all granted Require all granted
</Location> </Location>
<Location /docs/> <Location /docs/>
Header set Cache-Control public Header set Cache-Control public
ExpiresDefault "access plus 1 month" ExpiresDefault "access plus 1 month"
Header unset ETag Header unset ETag
</Location> </Location>
<Location /static/> <Location /static/>
Header set Cache-Control public Header set Cache-Control public
ExpiresDefault "access plus 1 month" ExpiresDefault "access plus 1 month"
Header unset ETag Header unset ETag
</Location> </Location>
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
CustomLog /httpdir/accesslog combined CustomLog /httpdir/accesslog combined
ErrorLog /httpdir/errorlog ErrorLog /httpdir/errorlog
LogLevel info LogLevel info
TypesConfig /etc/mime.types TypesConfig /etc/mime.types
AddDefaultCharset UTF-8 AddDefaultCharset UTF-8
CoreDumpDirectory /tmp CoreDumpDirectory /tmp
Alias /docs /usr/share/doc/bodhi-docs/html/ Alias /docs /usr/share/doc/bodhi-docs/html/
#Alias /static/v{{ bodhi_version.split('-')[0] }} {% if env == "staging" %}/srv/bodhi/bodhi/server/static/{% else %}/usr/lib/python3.7/site-packages/bodhi/server/static/{% endif %} {% if env == "staging" %}
Alias /static/v{{ bodhi_version.split('-')[0] }} /usr/lib/python3.7/site-packages/bodhi/server/static/ Alias /static/v{{ bodhi_version.split('-')[0] }} /srv/bodhi/bodhi/server/static/
WSGIDaemonProcess bodhi display-name=bodhi processes=2 threads=2 maximum-requests=1000 home=/httpdir {% else %}
WSGIApplicationGroup %{GLOBAL} Alias /static/v{{ bodhi_version.split('-')[0] }} /usr/lib/python3.7/site-packages/bodhi/server/static/
WSGISocketPrefix run/wsgi {% endif %}
WSGIRestrictStdout Off WSGIDaemonProcess bodhi display-name=bodhi processes=2 threads=2 maximum-requests=1000 home=/httpdir
WSGIRestrictSignal Off WSGIApplicationGroup %{GLOBAL}
WSGIPythonOptimize 1 WSGISocketPrefix run/wsgi
WSGIScriptAlias / /usr/share/bodhi/bodhi.wsgi WSGIRestrictStdout Off
WSGIRestrictSignal Off
WSGIPythonOptimize 1
WSGIScriptAlias / /usr/share/bodhi/bodhi.wsgi