Skip to content
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

Nginx conf custom directives and remove deprecated Apache directive #818

Merged
merged 3 commits into from
Sep 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ skip_list:
- no-jinja-nesting
- command-instead-of-module
- fqcn-builtins
- template-instead-of-copy # to skip over roles/ssl/tasks/copy.yml errors, temporarily.
12 changes: 0 additions & 12 deletions roles/apache/templates/apache2.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -165,18 +165,6 @@ AccessFileName .htaccess
Satisfy all
</Files>

#
# DefaultType is the default MIME type the server will use for a document
# if it cannot otherwise determine one, such as from filename extensions.
# If your server contains mostly text or HTML documents, "text/plain" is
# a good value. If most of your content is binary, such as applications
# or images, you may want to use "application/octet-stream" instead to
# keep browsers from trying to display binary files as though they are
# text.
#
DefaultType text/plain


#
# HostnameLookups: Log the names of clients or just their IP addresses
# e.g., www.apache.org (on) or 204.62.129.132 (off).
Expand Down
10 changes: 10 additions & 0 deletions roles/nginx/templates/nginx.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,16 @@ http {
# gzip_http_version 1.1;
# gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;

##
# Additional Settings
##

{% if nginx.http.custom_directives is defined %}
{% for directive in nginx.http.custom_directives %}
{{ directive }}
{% endfor %}
{% endif %}

##
# Virtual Host Configs
##
Expand Down