Bodhi: try to fix httpd.conf
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard
Pierre-Yves Chibon
parent
4a90e4d458
commit
ac90823ed6
2 changed files with 68 additions and 66 deletions
|
|
@ -40,72 +40,7 @@ data:
|
||||||
tail -qf /httpdir/accesslog /httpdir/errorlog &
|
tail -qf /httpdir/accesslog /httpdir/errorlog &
|
||||||
exec httpd -f /etc/bodhi/httpd.conf -DFOREGROUND -DNO_DETACH
|
exec httpd -f /etc/bodhi/httpd.conf -DFOREGROUND -DNO_DETACH
|
||||||
httpd.conf: |-
|
httpd.conf: |-
|
||||||
Listen 0.0.0.0:8080
|
{{ load_file('httpd.conf.j2') | indent }}
|
||||||
ServerRoot "/httpdir"
|
|
||||||
PidFile "/httpdir/httpd.pid"
|
|
||||||
LoadModule authn_file_module modules/mod_authn_file.so
|
|
||||||
LoadModule authn_anon_module modules/mod_authn_anon.so
|
|
||||||
LoadModule authz_user_module modules/mod_authz_user.so
|
|
||||||
LoadModule authz_host_module modules/mod_authz_host.so
|
|
||||||
LoadModule include_module modules/mod_include.so
|
|
||||||
LoadModule log_config_module modules/mod_log_config.so
|
|
||||||
LoadModule env_module modules/mod_env.so
|
|
||||||
LoadModule ext_filter_module modules/mod_ext_filter.so
|
|
||||||
LoadModule expires_module modules/mod_expires.so
|
|
||||||
LoadModule headers_module modules/mod_headers.so
|
|
||||||
LoadModule mime_module modules/mod_mime.so
|
|
||||||
LoadModule status_module modules/mod_status.so
|
|
||||||
LoadModule negotiation_module modules/mod_negotiation.so
|
|
||||||
LoadModule dir_module modules/mod_dir.so
|
|
||||||
LoadModule alias_module modules/mod_alias.so
|
|
||||||
LoadModule rewrite_module modules/mod_rewrite.so
|
|
||||||
LoadModule version_module modules/mod_version.so
|
|
||||||
LoadModule wsgi_module modules/mod_wsgi_python3.so
|
|
||||||
LoadModule authn_core_module modules/mod_authn_core.so
|
|
||||||
LoadModule authz_core_module modules/mod_authz_core.so
|
|
||||||
LoadModule unixd_module modules/mod_unixd.so
|
|
||||||
LoadModule mpm_event_module modules/mod_mpm_event.so
|
|
||||||
StartServers 20
|
|
||||||
ServerLimit 100
|
|
||||||
MaxRequestsPerChild 2000
|
|
||||||
MaxRequestWorkers 100
|
|
||||||
<Directory "/usr/share/doc/bodhi-docs/html/">
|
|
||||||
AllowOverride None
|
|
||||||
Require all granted
|
|
||||||
</Directory>
|
|
||||||
<Directory "/usr/lib/python3.7/site-packages/bodhi/server/static/">
|
|
||||||
AllowOverride None
|
|
||||||
Require all granted
|
|
||||||
</Directory>
|
|
||||||
<Location />
|
|
||||||
Require all granted
|
|
||||||
</Location>
|
|
||||||
<Location /docs/>
|
|
||||||
Header set Cache-Control public
|
|
||||||
ExpiresDefault "access plus 1 month"
|
|
||||||
Header unset ETag
|
|
||||||
</Location>
|
|
||||||
<Location /static/>
|
|
||||||
Header set Cache-Control public
|
|
||||||
ExpiresDefault "access plus 1 month"
|
|
||||||
Header unset ETag
|
|
||||||
</Location>
|
|
||||||
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
|
|
||||||
CustomLog /httpdir/accesslog combined
|
|
||||||
ErrorLog /httpdir/errorlog
|
|
||||||
LogLevel info
|
|
||||||
TypesConfig /etc/mime.types
|
|
||||||
AddDefaultCharset UTF-8
|
|
||||||
CoreDumpDirectory /tmp
|
|
||||||
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 %}
|
|
||||||
WSGIDaemonProcess bodhi display-name=bodhi processes=2 threads=2 maximum-requests=1000 home=/httpdir
|
|
||||||
WSGIApplicationGroup %{GLOBAL}
|
|
||||||
WSGISocketPrefix run/wsgi
|
|
||||||
WSGIRestrictStdout Off
|
|
||||||
WSGIRestrictSignal Off
|
|
||||||
WSGIPythonOptimize 1
|
|
||||||
WSGIScriptAlias / /usr/share/bodhi/bodhi.wsgi
|
|
||||||
logging.yaml: |-
|
logging.yaml: |-
|
||||||
{{ load_file('logging.yaml') | indent }}
|
{{ load_file('logging.yaml') | indent }}
|
||||||
production.ini: |-
|
production.ini: |-
|
||||||
|
|
|
||||||
67
roles/bodhi2/base/templates/httpd.conf.j2
Normal file
67
roles/bodhi2/base/templates/httpd.conf.j2
Normal file
|
|
@ -0,0 +1,67 @@
|
||||||
|
Listen 0.0.0.0:8080
|
||||||
|
ServerRoot "/httpdir"
|
||||||
|
PidFile "/httpdir/httpd.pid"
|
||||||
|
LoadModule authn_file_module modules/mod_authn_file.so
|
||||||
|
LoadModule authn_anon_module modules/mod_authn_anon.so
|
||||||
|
LoadModule authz_user_module modules/mod_authz_user.so
|
||||||
|
LoadModule authz_host_module modules/mod_authz_host.so
|
||||||
|
LoadModule include_module modules/mod_include.so
|
||||||
|
LoadModule log_config_module modules/mod_log_config.so
|
||||||
|
LoadModule env_module modules/mod_env.so
|
||||||
|
LoadModule ext_filter_module modules/mod_ext_filter.so
|
||||||
|
LoadModule expires_module modules/mod_expires.so
|
||||||
|
LoadModule headers_module modules/mod_headers.so
|
||||||
|
LoadModule mime_module modules/mod_mime.so
|
||||||
|
LoadModule status_module modules/mod_status.so
|
||||||
|
LoadModule negotiation_module modules/mod_negotiation.so
|
||||||
|
LoadModule dir_module modules/mod_dir.so
|
||||||
|
LoadModule alias_module modules/mod_alias.so
|
||||||
|
LoadModule rewrite_module modules/mod_rewrite.so
|
||||||
|
LoadModule version_module modules/mod_version.so
|
||||||
|
LoadModule wsgi_module modules/mod_wsgi_python3.so
|
||||||
|
LoadModule authn_core_module modules/mod_authn_core.so
|
||||||
|
LoadModule authz_core_module modules/mod_authz_core.so
|
||||||
|
LoadModule unixd_module modules/mod_unixd.so
|
||||||
|
LoadModule mpm_event_module modules/mod_mpm_event.so
|
||||||
|
StartServers 20
|
||||||
|
ServerLimit 100
|
||||||
|
MaxRequestsPerChild 2000
|
||||||
|
MaxRequestWorkers 100
|
||||||
|
<Directory "/usr/share/doc/bodhi-docs/html/">
|
||||||
|
AllowOverride None
|
||||||
|
Require all granted
|
||||||
|
</Directory>
|
||||||
|
<Directory "/usr/lib/python3.7/site-packages/bodhi/server/static/">
|
||||||
|
AllowOverride None
|
||||||
|
Require all granted
|
||||||
|
</Directory>
|
||||||
|
<Location />
|
||||||
|
Require all granted
|
||||||
|
</Location>
|
||||||
|
<Location /docs/>
|
||||||
|
Header set Cache-Control public
|
||||||
|
ExpiresDefault "access plus 1 month"
|
||||||
|
Header unset ETag
|
||||||
|
</Location>
|
||||||
|
<Location /static/>
|
||||||
|
Header set Cache-Control public
|
||||||
|
ExpiresDefault "access plus 1 month"
|
||||||
|
Header unset ETag
|
||||||
|
</Location>
|
||||||
|
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
|
||||||
|
CustomLog /httpdir/accesslog combined
|
||||||
|
ErrorLog /httpdir/errorlog
|
||||||
|
LogLevel info
|
||||||
|
TypesConfig /etc/mime.types
|
||||||
|
AddDefaultCharset UTF-8
|
||||||
|
CoreDumpDirectory /tmp
|
||||||
|
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 %}
|
||||||
|
Alias /static/v{{ bodhi_version.split('-')[0] }} /usr/lib/python3.7/site-packages/bodhi/server/static/
|
||||||
|
WSGIDaemonProcess bodhi display-name=bodhi processes=2 threads=2 maximum-requests=1000 home=/httpdir
|
||||||
|
WSGIApplicationGroup %{GLOBAL}
|
||||||
|
WSGISocketPrefix run/wsgi
|
||||||
|
WSGIRestrictStdout Off
|
||||||
|
WSGIRestrictSignal Off
|
||||||
|
WSGIPythonOptimize 1
|
||||||
|
WSGIScriptAlias / /usr/share/bodhi/bodhi.wsgi
|
||||||
Loading…
Add table
Add a link
Reference in a new issue