-
Notifications
You must be signed in to change notification settings - Fork 118
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
reorganize the internal structure #428
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
ServerRoot "/etc/httpd" | ||
{%- if env.LISTEN_ALL_INTERFACES | lower == "true" %} | ||
Listen [::]:{{ env.HTTP_PORT }} | ||
{% else %} | ||
Listen {{ env.IRONIC_URL_HOST }}:{{ env.HTTP_PORT }} | ||
{% endif %} | ||
Include conf.modules.d/*.conf | ||
User apache | ||
Group apache | ||
|
||
ServerName {{ env.IRONIC_URL_HOST }}:{{ env.HTTP_PORT }} | ||
|
||
<Directory /> | ||
AllowOverride none | ||
Require all denied | ||
</Directory> | ||
|
||
DocumentRoot "/shared/html" | ||
|
||
<Directory "/shared/html"> | ||
Options Indexes FollowSymLinks | ||
AllowOverride None | ||
Require all granted | ||
</Directory> | ||
|
||
{%- if env.HTTPD_SERVE_NODE_IMAGES | lower == "true" %} | ||
<Directory "/shared/html/images"> | ||
Options Indexes FollowSymLinks | ||
AllowOverride None | ||
Require all granted | ||
</Directory> | ||
{% endif %} | ||
|
||
<IfModule dir_module> | ||
DirectoryIndex index.html | ||
</IfModule> | ||
|
||
<Files ".ht*"> | ||
Require all denied | ||
</Files> | ||
|
||
ErrorLog "/dev/stderr" | ||
|
||
LogLevel warn | ||
|
||
<IfModule log_config_module> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Everything below this line seems to be repeating the defaults or at least stuff that is not metal3-specific. Do we really need it? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I have no strong option about that, I am happy to change it if it is useless, I just copied everything over from the previous config that were not modified by the "sed"s There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I was looking into these some of these are not hard coded defaults, I think neither the logging nor the mime types are the hard coded defaults. When I have more time I could go through this file and remove options that match the hard coded defaults. I will also turn EnableSendfile on configurable in a followup anyways. But for now I would like to merge this and not delay the merger further by introducing test failures that might result from deleting something here. |
||
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined | ||
LogFormat "%h %l %u %t \"%r\" %>s %b" common | ||
<IfModule logio_module> | ||
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio | ||
</IfModule> | ||
CustomLog "/dev/stderr" combined | ||
</IfModule> | ||
|
||
<IfModule mime_module> | ||
TypesConfig /etc/mime.types | ||
AddType application/x-compress .Z | ||
AddType application/x-gzip .gz .tgz | ||
AddType text/html .shtml | ||
AddOutputFilter INCLUDES .shtml | ||
</IfModule> | ||
|
||
AddDefaultCharset UTF-8 | ||
|
||
<IfModule mime_magic_module> | ||
MIMEMagicFile conf/magic | ||
</IfModule> | ||
|
||
PidFile /var/tmp/httpd.pid | ||
|
||
# EnableSendfile directive could speed up deployments but it could also cause | ||
# issues depending on the underlying file system, to learn more: | ||
# https://httpd.apache.org/docs/current/mod/core.html#enablesendfile | ||
{%- if env.HTTPD_ENABLE_SENDFILE | lower == "true" %} | ||
EnableSendfile on | ||
{% endif %} | ||
|
||
# http TRACE can be subjected to abuse and should be disabled | ||
TraceEnable off | ||
|
||
# provide minimal server information | ||
ServerTokens Prod | ||
ServerSignature Off | ||
|
||
IncludeOptional conf.d/*.conf | ||
|
This file was deleted.
This file was deleted.
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so this configuration file is not needed anymore?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it has been moved up a bit to L49 https://github.com/metal3-io/ironic-image/pull/428/files#diff-dd2c0eb6ea5cfc6c4bd4eac30934e2d5746747af48fef6da689e85b752f39557R49