-
-
Notifications
You must be signed in to change notification settings - Fork 64
feat: manage moin host apache2 conf #566
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
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
84e2df4
chore: source moin apache2 conf
JacobCoffee f4f9078
feat: add timing to logs
JacobCoffee b72efc8
feat: manage apache conf
JacobCoffee 7994ecc
Update salt/moin/configs/moin.apache.conf.jinja
JacobCoffee 4428512
fix: use custom format
JacobCoffee File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| # The directory where shm and other runtime files will be stored. | ||
|
|
||
| DefaultRuntimeDir ${APACHE_RUN_DIR} | ||
|
|
||
| # PidFile: The file in which the server should record its process | ||
| # identification number when it starts. | ||
| # This needs to be set in /etc/apache2/envvars | ||
| PidFile ${APACHE_PID_FILE} | ||
|
|
||
| # Timeout: The number of seconds before receives and sends time out. | ||
| Timeout 300 | ||
|
|
||
| # KeepAlive: Whether or not to allow persistent connections (more than | ||
| # one request per connection). Set to "Off" to deactivate. | ||
| KeepAlive On | ||
|
|
||
| # MaxKeepAliveRequests: The maximum number of requests to allow | ||
| # during a persistent connection. Set to 0 to allow an unlimited amount. | ||
| # We recommend you leave this number high, for maximum performance. | ||
| MaxKeepAliveRequests 100 | ||
|
|
||
| # KeepAliveTimeout: Number of seconds to wait for the next request from the | ||
| # same client on the same connection. | ||
| KeepAliveTimeout 5 | ||
|
|
||
|
|
||
| # These need to be set in /etc/apache2/envvars | ||
| User ${APACHE_RUN_USER} | ||
| Group ${APACHE_RUN_GROUP} | ||
|
|
||
| # HostnameLookups: Log the names of clients or just their IP addresses | ||
| # e.g., www.apache.org (on) or 204.62.129.132 (off). | ||
| # The default is off because it'd be overall better for the net if people | ||
| # had to knowingly turn this feature on, since enabling it means that | ||
| # each client request will result in AT LEAST one lookup request to the | ||
| # nameserver. | ||
| HostnameLookups Off | ||
|
|
||
| # ErrorLog: The location of the error log file. | ||
| # If you do not specify an ErrorLog directive within a <VirtualHost> | ||
| # container, error messages relating to that virtual host will be | ||
| # logged here. If you *do* define an error logfile for a <VirtualHost> | ||
| # container, that host's errors will be logged there and not here. | ||
| ErrorLog ${APACHE_LOG_DIR}/error.log | ||
|
|
||
| # LogLevel: Control the severity of messages logged to the error_log. | ||
| # Available values: trace8, ..., trace1, debug, info, notice, warn, | ||
| # error, crit, alert, emerg. | ||
| # It is also possible to configure the log level for particular modules, e.g. | ||
| # "LogLevel info ssl:warn" | ||
| LogLevel warn | ||
|
|
||
| # Include module configuration: | ||
| IncludeOptional mods-enabled/*.load | ||
| IncludeOptional mods-enabled/*.conf | ||
|
|
||
| # Include list of ports to listen on | ||
| Include ports.conf | ||
|
|
||
| # Sets the default security model of the Apache2 HTTPD server. It does | ||
| # not allow access to the root filesystem outside of /usr/share and /var/www. | ||
| # The former is used by web applications packaged in Debian, | ||
| # the latter may be used for local directories served by the web server. If | ||
| # your system is serving content from a sub-directory in /srv you must allow | ||
| # access here, or in any related virtual host. | ||
| <Directory /> | ||
| Options FollowSymLinks | ||
| AllowOverride None | ||
| Require all denied | ||
| </Directory> | ||
|
|
||
| <Directory /usr/share> | ||
| AllowOverride None | ||
| Require all granted | ||
| </Directory> | ||
|
|
||
| <Directory /var/www/> | ||
| Options Indexes FollowSymLinks | ||
| AllowOverride None | ||
| Require all granted | ||
| </Directory> | ||
|
|
||
| #<Directory /srv/> | ||
| # Options Indexes FollowSymLinks | ||
| # AllowOverride None | ||
| # Require all granted | ||
| #</Directory> | ||
|
|
||
| # AccessFileName: The name of the file to look for in each directory | ||
| # for additional configuration directives. See also the AllowOverride | ||
| # directive. | ||
| AccessFileName .htaccess | ||
|
|
||
| # The following lines prevent .htaccess and .htpasswd files from being | ||
| # viewed by Web clients. | ||
| <FilesMatch "^\.ht"> | ||
| Require all denied | ||
| </FilesMatch> | ||
|
|
||
| # The following directives define some format nicknames for use with | ||
| # a CustomLog directive. | ||
| # | ||
| # These deviate from the Common Log Format definitions in that they use %O | ||
| # (the actual bytes sent including headers) instead of %b (the size of the | ||
| # requested file), because the latter makes it impossible to detect partial | ||
| # requests. | ||
| # | ||
| # Note that the use of %{X-Forwarded-For}i instead of %h is not recommended. | ||
| # Use mod_remoteip instead. | ||
| LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined | ||
| LogFormat "%h %l %u %t \"%r\" %>s %O %D \"%{Referer}i\" \"%{User-Agent}i\"" combined | ||
JacobCoffee marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| LogFormat "%h %l %u %t \"%r\" %>s %O" common | ||
| LogFormat "%{Referer}i -> %U" referer | ||
| LogFormat "%{User-agent}i" agent | ||
|
|
||
| # Include of directories ignores editors' and dpkg's backup files, | ||
| # see README.Debian for details. | ||
|
|
||
| # Include generic snippets of statements | ||
| IncludeOptional conf-enabled/*.conf | ||
|
|
||
| # Include the virtual host configurations: | ||
| IncludeOptional sites-enabled/*.conf | ||
|
|
||
| # vim: syntax=apache ts=4 sw=4 sts=4 sr noet | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.