saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(apache-2.4.config.jinja): fix salt-lint errors

Browse Source 
```bash
Examining apache/files/FreeBSD/apache-2.4.config.jinja of type state
[201] Trailing whitespace
apache/files/FreeBSD/apache-2.4.config.jinja:171
```
This commit is contained in:
Imran Iqbal 2019-10-17 07:41:43 +01:00
parent f4045efeff
commit e2c1c2e66f
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apache/files/FreeBSD/apache-2.4.config.jinja
View File

@ -2,20 +2,20 @@
# This is the main Apache HTTP server configuration file. It contains the # This is the main Apache HTTP server configuration file. It contains the
# configuration directives that give the server its instructions. # configuration directives that give the server its instructions.
# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information. # See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
# In particular, see # In particular, see
# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html> # <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
# for a discussion of each configuration directive. # for a discussion of each configuration directive.
# #
# Do NOT simply read the instructions in here without understanding # Do NOT simply read the instructions in here without understanding
# what they do. They're here only as hints or reminders. If you are unsure # what they do. They're here only as hints or reminders. If you are unsure
# consult the online docs. You have been warned. # consult the online docs. You have been warned.
# #
# Configuration and logfile names: If the filenames you specify for many # Configuration and logfile names: If the filenames you specify for many
# of the server's control files begin with "/" (or "drive:/" for Win32), the # of the server's control files begin with "/" (or "drive:/" for Win32), the
# server will use that explicit path. If the filenames do *not* begin # server will use that explicit path. If the filenames do *not* begin
# with "/", the value of ServerRoot is prepended -- so "logs/access_log" # with "/", the value of ServerRoot is prepended -- so "logs/access_log"
# with ServerRoot set to "/usr/local/apache2" will be interpreted by the # with ServerRoot set to "/usr/local/apache2" will be interpreted by the
# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" # server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log"
# will be interpreted as '/logs/access_log'. # will be interpreted as '/logs/access_log'.
# #
@ -168,13 +168,13 @@ LoadModule alias_module libexec/apache24/mod_alias.so
# Third party modules # Third party modules
IncludeOptional etc/apache24/modules.d/[0-9][0-9][0-9]_*.conf IncludeOptional etc/apache24/modules.d/[0-9][0-9][0-9]_*.conf
Include {{ apache.portsfile }} Include {{ apache.portsfile }}
<IfModule unixd_module> <IfModule unixd_module>
# #
# If you wish httpd to run as a different user or group, you must run # If you wish httpd to run as a different user or group, you must run
# httpd as root initially and it will switch. # httpd as root initially and it will switch.
# #
# User/Group: The name (or #number) of the user/group to run httpd as. # User/Group: The name (or #number) of the user/group to run httpd as.
# It is usually good practice to create a dedicated user and group for # It is usually good practice to create a dedicated user and group for
@ -215,7 +215,7 @@ ServerAdmin root@localhost
# #
# Deny access to the entirety of your server's filesystem. You must # Deny access to the entirety of your server's filesystem. You must
# explicitly permit access to web content directories in other # explicitly permit access to web content directories in other
# <Directory> blocks below. # <Directory> blocks below.
# #
<Directory /> <Directory />
@ -279,8 +279,8 @@ DocumentRoot "{{ apache.global_document_root }}"
</IfModule> </IfModule>
# #
# The following lines prevent .htaccess and .htpasswd files from being # The following lines prevent .htaccess and .htpasswd files from being
# viewed by Web clients. # viewed by Web clients.
# #
<Files ".ht*"> <Files ".ht*">
Require all denied Require all denied
@ -333,8 +333,8 @@ LogLevel warn
<IfModule alias_module> <IfModule alias_module>
# #
# Redirect: Allows you to tell clients about documents that used to # Redirect: Allows you to tell clients about documents that used to
# exist in your server's namespace, but do not anymore. The client # exist in your server's namespace, but do not anymore. The client
# will make a new request for the document at its new location. # will make a new request for the document at its new location.
# Example: # Example:
# Redirect permanent /foo http://www.example.com/bar # Redirect permanent /foo http://www.example.com/bar
@ -351,7 +351,7 @@ LogLevel warn
# the filesystem path. # the filesystem path.
# #
# ScriptAlias: This controls which directories contain server scripts. # ScriptAlias: This controls which directories contain server scripts.
# ScriptAliases are essentially the same as Aliases, except that # ScriptAliases are essentially the same as Aliases, except that
# documents in the target directory are treated as applications and # documents in the target directory are treated as applications and
# run by the server when requested rather than as documents sent to the # run by the server when requested rather than as documents sent to the
@ -454,10 +454,10 @@ LogLevel warn
#MaxRanges unlimited #MaxRanges unlimited
# #
# EnableMMAP and EnableSendfile: On systems that support it, # EnableMMAP and EnableSendfile: On systems that support it,
# memory-mapping or the sendfile syscall may be used to deliver # memory-mapping or the sendfile syscall may be used to deliver
# files. This usually improves server performance, but must # files. This usually improves server performance, but must
# be turned off when serving from networked-mounted # be turned off when serving from networked-mounted
# filesystems or if support for these functions is otherwise # filesystems or if support for these functions is otherwise
# broken on your system. # broken on your system.
# Defaults: EnableMMAP On, EnableSendfile Off # Defaults: EnableMMAP On, EnableSendfile Off
@ -467,9 +467,9 @@ LogLevel warn
# Supplemental configuration # Supplemental configuration
# #
# The configuration files in the etc/apache24/extra/ directory can be # The configuration files in the etc/apache24/extra/ directory can be
# included to add extra features or to modify the default configuration of # included to add extra features or to modify the default configuration of
# the server, or you may simply copy their contents here and change as # the server, or you may simply copy their contents here and change as
# necessary. # necessary.
# Server-pool management (MPM specific) # Server-pool management (MPM specific)