Merge apache2 configuration from branch '230-rebase-to-stretch' into pu
This commit is contained in:
		
						commit
						bc676f8b50
					
				|  | @ -11,7 +11,7 @@ AssignUserId www-data www-data | |||
| 
 | ||||
| # Deny access to the root filesystem | ||||
| <Directory /> | ||||
|   Options +FollowSymLinks | ||||
|   Options FollowSymLinks | ||||
|   AllowOverride None | ||||
|   Order allow,deny | ||||
|   Deny from all | ||||
|  | @ -62,13 +62,13 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ | |||
| 
 | ||||
| <Directory /usr/share/phpmyadmin> | ||||
|   AllowOverride AuthConfig Options FileInfo Limit Indexes | ||||
|   Options +Indexes +Includes +FollowSymLinks +MultiViews | ||||
|   Options Indexes Includes FollowSymLinks MultiViews | ||||
|   Order allow,deny | ||||
|   Allow from all | ||||
| </Directory> | ||||
| <Directory /usr/share/squirrelmail> | ||||
|   AllowOverride AuthConfig Options FileInfo Limit Indexes | ||||
|   Options +Indexes +Includes +FollowSymLinks +MultiViews | ||||
|   Options Indexes Includes FollowSymLinks MultiViews | ||||
|   Order allow,deny | ||||
|   Allow from all | ||||
| </Directory> | ||||
|  |  | |||
|  | @ -51,7 +51,7 @@ SSLSessionCacheTimeout  300 | |||
| #   Semaphore: | ||||
| #   Configure the path to the mutual exclusion semaphore the | ||||
| #   SSL engine uses internally for inter-process synchronization.  | ||||
| Mutex  file:${APACHE_RUN_DIR} | ||||
| #SSLMutex  file:${APACHE_RUN_DIR}/ssl_mutex | ||||
| 
 | ||||
| #   SSL Cipher Suite: | ||||
| #   List the ciphers that the client is permitted to negotiate. See the | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue