Attachment #318976 for bug #410607

Lines 36-41 Link Here

(-)conf/httpd.conf (+1 lines)
36	# ServerRoot at a non-local disk, be sure to point the LockFile directive	36	# ServerRoot at a non-local disk, be sure to point the LockFile directive
37	# at a local disk. If you wish to share the same ServerRoot for multiple	37	# at a local disk. If you wish to share the same ServerRoot for multiple
38	# httpd daemons, you will need to change at least LockFile and PidFile.	38	# httpd daemons, you will need to change at least LockFile and PidFile.
		39	# Comment: The LockFile directive has been replaced by the Mutex directive
39	ServerRoot "/usr/lib/apache2"	40	ServerRoot "/usr/lib/apache2"
40		41
41	# Dynamic Shared Object (DSO) Support	42	# Dynamic Shared Object (DSO) Support

Lines 8-15 AliasMatch ^/manual(?:/(?:de\|en\|es\|fr\|ja Link Here

(-)conf/modules.d/00_apache_manual.conf (-2 / +1 lines)
8	<Directory "/usr/share/doc/apache-VERSION/manual">	8	<Directory "/usr/share/doc/apache-VERSION/manual">
9	Options Indexes	9	Options Indexes
10	AllowOverride None	10	AllowOverride None
11	Order allow,deny	11	Require all granted
12	Allow from all
13		12
14	<Files *.html>	13	<Files *.html>
15	SetHandler type-map	14	SetHandler type-map




# filesystems or if support for these functions is otherwise
# broken on your system.
EnableMMAP On
EnableSendfile Off

# FileETag: Configures the file attributes that are used to create
# the ETag (entity tag) response header field when the document is
# based on a static file. (The ETag value is used in cache management
# to save network bandwidth.)
FileETag MTime Size

# ContentDigest: This directive enables the generation of Content-MD5
# headers as defined in RFC1864 respectively RFC2616.

<Directory />
	Options FollowSymLinks
	AllowOverride None
	Require all denied
	Deny from all
</Directory>

# DirectoryIndex: sets the file that Apache will serve if a directory

# The following lines prevent .htaccess and .htpasswd files from being
# viewed by Web clients.
<FilesMatch "^\.ht">
	Require all denied
	Deny from all
</FilesMatch>

# vim: ts=4 filetype=apache

Lines 30-37 Alias /error/ "/usr/share/apache2/error/ Link Here

(-)conf/modules.d/00_error_documents.conf (-2 / +1 lines)
30	Options IncludesNoExec	30	Options IncludesNoExec
31	AddOutputFilter Includes html	31	AddOutputFilter Includes html
32	AddHandler type-map var	32	AddHandler type-map var
33	Order allow,deny	33	Require all granted
34	Allow from all
35	LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr	34	LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr
36	ForceLanguagePriority Prefer Fallback	35	ForceLanguagePriority Prefer Fallback
37	</Directory>	36	</Directory>

Lines 7-14 Alias /icons/ "/usr/share/apache2/icons/ Link Here

(-)conf/modules.d/00_mod_autoindex.conf (-2 / +1 lines)
7	<Directory "/usr/share/apache2/icons">	7	<Directory "/usr/share/apache2/icons">
8	Options Indexes MultiViews	8	Options Indexes MultiViews
9	AllowOverride None	9	AllowOverride None
10	Order allow,deny	10	Require all granted
11	Allow from all
12	</Directory>	11	</Directory>
13	</IfModule>	12	</IfModule>
14		13

Lines 3-11 Link Here

(-)conf/modules.d/00_mod_info.conf (-3 / +1 lines)
3	# http://servername/server-info	3	# http://servername/server-info
4	<Location /server-info>	4	<Location /server-info>
5	SetHandler server-info	5	SetHandler server-info
6	Order deny,allow	6	Require host 127.0.0.1
7	Deny from all
8	Allow from 127.0.0.1
9	</Location>	7	</Location>
10	</IfDefine>	8	</IfDefine>
11		9




# DefaultType: 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

<IfModule mime_module>
# TypesConfig points to the file containing the list of mappings from
# filename extension to MIME-type.

Lines 3-11 Link Here

(-)conf/modules.d/00_mod_status.conf (-3 / +1 lines)
3	# with the URL of http://servername/server-status	3	# with the URL of http://servername/server-status
4	<Location /server-status>	4	<Location /server-status>
5	SetHandler server-status	5	SetHandler server-status
6	Order deny,allow	6	Require host 127.0.0.1
7	Deny from all
8	Allow from 127.0.0.1
9	</Location>	7	</Location>
10		8
11	# ExtendedStatus controls whether Apache will generate "full" status	9	# ExtendedStatus controls whether Apache will generate "full" status




	AllowOverride FileInfo AuthConfig Limit Indexes
	Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
	<Limit GET POST OPTIONS>
		Require all granted
		Allow from all
	</Limit>
	<LimitExcept GET POST OPTIONS>
		Require all denied
		Deny from all
	</LimitExcept>
</Directory>





PidFile /var/run/apache2.pid

# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
# Mutex file:/var/run/apache_mpm_mutex

# Only one of the below sections will be relevant on your
# installed httpd.  Use "/usr/sbin/apache2 -l" to find out the

# These configuration directives apply to all MPMs
#
# StartServers: Number of child server processes created at startup
# MaxRequestWorkers: Maximum number of child processes to serve requests
# MaxRequestsPerChild: Limit on the number of requests that an individual child
#                      server will handle during its life


	StartServers		5
	MinSpareServers		5
	MaxSpareServers		10
	MaxRequestWorkers	150
	MaxRequestsPerChild	10000
</IfModule>


	MinSpareThreads		25
	MaxSpareThreads		75
	ThreadsPerChild		25
	MaxRequestWorkers	150
	MaxRequestsPerChild	10000
</IfModule>


	MinSpareThreads		25
	MaxSpareThreads		75
	ThreadsPerChild		25
	MaxRequestWorkers	150
	MaxRequestsPerChild	10000
</IfModule>


	MinSpareProcessors	2
	MinProcessors		2
	MaxProcessors		10
	MaxRequestWorkers	150
	MaxRequestsPerChild	1000
	ExpireTimeout		1800


	StartServers		5
	MinSpareServers		5
	MaxSpareServers		10
	MaxRequestWorkers	150
	MaxRequestsPerChild	10000
</IfModule>


Lines 57-63 SSLSessionCacheTimeout 300 Link Here

(-)conf/modules.d/40_mod_ssl.conf (-1 / +1 lines)
57	## Semaphore:	57	## Semaphore:
58	# Configure the path to the mutual exclusion semaphore the SSL engine uses	58	# Configure the path to the mutual exclusion semaphore the SSL engine uses
59	# internally for inter-process synchronization.	59	# internally for inter-process synchronization.
60	SSLMutex file:/var/run/ssl_mutex	60	Mutex file:/var/run/apache_ssl_mutex ssl-cache
61	</IfDefine>	61	</IfDefine>
62		62
63	# vim: ts=4 filetype=apache	63	# vim: ts=4 filetype=apache

Lines 11-19 LDAPOpCacheTTL 600 Link Here

(-)conf/modules.d/46_mod_ldap.conf (-3 / +1 lines)
11		11
12	<Location /ldap-status>	12	<Location /ldap-status>
13	SetHandler ldap-status	13	SetHandler ldap-status
14	Order deny,allow	14	Require host 127.0.0.1
15	Deny from all
16	Allow from 127.0.0.1
17	</Location>	15	</Location>
18	</IfDefine>	16	</IfDefine>
19		17

Lines 25-33 Link Here

(-)conf/vhosts.d/00_default_vhost.conf (-3 lines)
25	#Listen 12.34.56.78:80	25	#Listen 12.34.56.78:80
26	Listen 80	26	Listen 80
27		27
28	# Use name-based virtual hosting.
29	NameVirtualHost *:80
30
31	# When virtual hosts are enabled, the main host defined in the default	28	# When virtual hosts are enabled, the main host defined in the default
32	# httpd.conf configuration will go away. We redefine it here so that it is	29	# httpd.conf configuration will go away. We redefine it here so that it is
33	# still available.	30	# still available.




	AllowOverride All

	# Controls who can get stuff from this server.
	Require all granted
	Allow from all
</Directory>

<IfModule alias_module>

<Directory "/var/www/localhost/cgi-bin">
	AllowOverride None
	Options None
	Require all granted
	Allow from all
</Directory>

# vim: ts=4 filetype=apache




		Options Indexes FollowSymLinks
		AllowOverride None

		Require all granted
		Allow from all

	</Directory>


	#<Directory "/var/www/example.com/cgi-bin">
	#	AllowOverride None
	#	Options None
	#	Require all granted
	#	Allow from all
	#</Directory>

	# If you have multiple users on this system, each with their own vhost,

	#		Options IncludesNoExec
	#		AddOutputFilter Includes html
	#		AddHandler type-map var
	#		Require all granted
	#		Allow from all
	#	</Directory>
	#</IfDefine ERRORDOCS>
	

	#<Directory "/var/www/example.com/icons/">
	#	Options Indexes MultiViews
	#	AllowOverride None
	#	Require all granted
	#	Allow from all
	#</Directory>

	# Create a logfile for this vhost




#
# If you want to use a defintion other then the default, you should remove
# -D DEFAULT_VHOST from APACHE2_OPTS in /etc/conf.d/apache2.
#
# All requests (on any IP address) to port 80 will be handled by Virtual Hosts
# This is the default setting in Gentoo:
#NameVirtualHost *:80
#
# Only requests on this IP address on port 80 will be handled by Virtual Hosts
# (note: you may need to modify/add a Listen directive in httpd.conf)
#NameVirtualHost 1.2.3.4:80

# The actual virtual host definition.
# is set for NameVirtualHost
<VirtualHost *:80>
	# ServerName and ServerAlias are how the server determines which virtual
	# host should be used.

		Options Indexes FollowSymLinks
		AllowOverride None

		Require all granted
		Allow from all
	</Directory>

	# By default cgi-bin points to the global cgi-bin in /var/www/localhost

	#<Directory "/var/www/example.com/cgi-bin">
	#	AllowOverride None
	#	Options None
	#	Require all granted
	#	Allow from all
	#</Directory>

	# If you have multiple users on this system, each with their own vhost,

	#		Options IncludesNoExec
	#		AddOutputFilter Includes html
	#		AddHandler type-map var
	#		Require all granted
	#		Allow from all
	#	</Directory>
	#</IfDefine ERRORDOCS>
	

	#<Directory "/var/www/example.com/icons/">
	#	Options Indexes MultiViews
	#	AllowOverride None
	#	Require all granted
	#	Allow from all
	#</Directory>
	
	# Create a logfile for this vhost




		Options Indexes FollowSymLinks
		AllowOverride None

		Require all granted
		Allow from all
	</Directory>

	# By default cgi-bin points to the global cgi-bin in /var/www/localhost

	#<Directory "/var/www/example.com/cgi-bin">
	#	AllowOverride None
	#	Options None
	#	Require all granted
	#	Allow from all
	#</Directory>

	# If you have multiple users on this system, each with their own vhost,

	#		Options IncludesNoExec
	#		AddOutputFilter Includes html
	#		AddHandler type-map var
	#		Require all granted
	#		Allow from all
	#	</Directory>
	#</IfDefine ERRORDOCS>


	#<Directory "/var/www/example.com/icons/">
	#	Options Indexes MultiViews
	#	AllowOverride None
	#	Require all granted
	#	Allow from all
	#</Directory>

	# Create a logfile for this vhost


# If you want to force SSL for a virtualhost, you can uncomment this section

# Make sure there is a proper NameVirtualHost already setup, if not, you
# can uncomment this one. See name-based-vhost.conf.example for details.
#NameVirtualHost *:80

# You can optionally use the IP address here instead, if you want every
# connection to this IP address to be forced to SSL
#<VirtualHost *:80>

Return to bug 410607

Lines 69-81 HostnameLookups Off Link Here

(-)conf/modules.d/00_default_settings.conf (-7 / +5 lines)
69	# filesystems or if support for these functions is otherwise	69	# filesystems or if support for these functions is otherwise
70	# broken on your system.	70	# broken on your system.
71	EnableMMAP On	71	EnableMMAP On
72	EnableSendfile On	72	EnableSendfile Off
73		73
74	# FileEtag: Configures the file attributes that are used to create	74	# FileETag: Configures the file attributes that are used to create
75	# the ETag (entity tag) response header field when the document is	75	# the ETag (entity tag) response header field when the document is
76	# based on a static file. (The ETag value is used in cache management	76	# based on a static file. (The ETag value is used in cache management
77	# to save network bandwidth.)	77	# to save network bandwidth.)
78	FileEtag INode MTime Size	78	FileETag MTime Size
79		79
80	# ContentDigest: This directive enables the generation of Content-MD5	80	# ContentDigest: This directive enables the generation of Content-MD5
81	# headers as defined in RFC1864 respectively RFC2616.	81	# headers as defined in RFC1864 respectively RFC2616.
Lines 107-114 LogLevel warn Link Here
107	<Directory />	107	<Directory />
108	Options FollowSymLinks	108	Options FollowSymLinks
109	AllowOverride None	109	AllowOverride None
110	Order deny,allow	110	Require all denied
111	Deny from all
112	</Directory>	111	</Directory>
113		112
114	# DirectoryIndex: sets the file that Apache will serve if a directory	113	# DirectoryIndex: sets the file that Apache will serve if a directory
Lines 127-134 LogLevel warn Link Here
127	# The following lines prevent .htaccess and .htpasswd files from being	126	# The following lines prevent .htaccess and .htpasswd files from being
128	# viewed by Web clients.	127	# viewed by Web clients.
129	<FilesMatch "^\.ht">	128	<FilesMatch "^\.ht">
130	Order allow,deny	129	Require all denied
131	Deny from all
132	</FilesMatch>	130	</FilesMatch>
133		131
134	# vim: ts=4 filetype=apache	132	# vim: ts=4 filetype=apache

Lines 1-12 Link Here

(-)conf/modules.d/00_mod_mime.conf (-9 lines)
1	# DefaultType: the default MIME type the server will use for a document
2	# if it cannot otherwise determine one, such as from filename extensions.
3	# If your server contains mostly text or HTML documents, "text/plain" is
4	# a good value. If most of your content is binary, such as applications
5	# or images, you may want to use "application/octet-stream" instead to
6	# keep browsers from trying to display binary files as though they are
7	# text.
8	DefaultType text/plain
9
10	<IfModule mime_module>	1	<IfModule mime_module>
11	# TypesConfig points to the file containing the list of mappings from	2	# TypesConfig points to the file containing the list of mappings from
12	# filename extension to MIME-type.	3	# filename extension to MIME-type.

Lines 11-22 UserDir public_html Link Here

(-)conf/modules.d/00_mod_userdir.conf (-4 / +2 lines)
11	AllowOverride FileInfo AuthConfig Limit Indexes	11	AllowOverride FileInfo AuthConfig Limit Indexes
12	Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec	12	Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
13	<Limit GET POST OPTIONS>	13	<Limit GET POST OPTIONS>
14	Order allow,deny	14	Require all granted
15	Allow from all
16	</Limit>	15	</Limit>
17	<LimitExcept GET POST OPTIONS>	16	<LimitExcept GET POST OPTIONS>
18	Order deny,allow	17	Require all denied
19	Deny from all
20	</LimitExcept>	18	</LimitExcept>
21	</Directory>	19	</Directory>
22		20

Lines 7-13 Link Here

(-)conf/modules.d/00_mpm.conf (-7 / +7 lines)
7	PidFile /var/run/apache2.pid	7	PidFile /var/run/apache2.pid
8		8
9	# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.	9	# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
10	#LockFile /var/run/apache2.lock	10	# Mutex file:/var/run/apache_mpm_mutex
11		11
12	# Only one of the below sections will be relevant on your	12	# Only one of the below sections will be relevant on your
13	# installed httpd. Use "/usr/sbin/apache2 -l" to find out the	13	# installed httpd. Use "/usr/sbin/apache2 -l" to find out the
Lines 17-23 PidFile /var/run/apache2.pid Link Here
17	# These configuration directives apply to all MPMs	17	# These configuration directives apply to all MPMs
18	#	18	#
19	# StartServers: Number of child server processes created at startup	19	# StartServers: Number of child server processes created at startup
20	# MaxClients: Maximum number of child processes to serve requests	20	# MaxRequestWorkers: Maximum number of child processes to serve requests
21	# MaxRequestsPerChild: Limit on the number of requests that an individual child	21	# MaxRequestsPerChild: Limit on the number of requests that an individual child
22	# server will handle during its life	22	# server will handle during its life
23		23
Lines 31-37 PidFile /var/run/apache2.pid Link Here
31	StartServers 5	31	StartServers 5
32	MinSpareServers 5	32	MinSpareServers 5
33	MaxSpareServers 10	33	MaxSpareServers 10
34	MaxClients 150	34	MaxRequestWorkers 150
35	MaxRequestsPerChild 10000	35	MaxRequestsPerChild 10000
36	</IfModule>	36	</IfModule>
37		37
Lines 46-52 PidFile /var/run/apache2.pid Link Here
46	MinSpareThreads 25	46	MinSpareThreads 25
47	MaxSpareThreads 75	47	MaxSpareThreads 75
48	ThreadsPerChild 25	48	ThreadsPerChild 25
49	MaxClients 150	49	MaxRequestWorkers 150
50	MaxRequestsPerChild 10000	50	MaxRequestsPerChild 10000
51	</IfModule>	51	</IfModule>
52		52
Lines 60-66 PidFile /var/run/apache2.pid Link Here
60	MinSpareThreads 25	60	MinSpareThreads 25
61	MaxSpareThreads 75	61	MaxSpareThreads 75
62	ThreadsPerChild 25	62	ThreadsPerChild 25
63	MaxClients 150	63	MaxRequestWorkers 150
64	MaxRequestsPerChild 10000	64	MaxRequestsPerChild 10000
65	</IfModule>	65	</IfModule>
66		66
Lines 76-82 PidFile /var/run/apache2.pid Link Here
76	MinSpareProcessors 2	76	MinSpareProcessors 2
77	MinProcessors 2	77	MinProcessors 2
78	MaxProcessors 10	78	MaxProcessors 10
79	MaxClients 150	79	MaxRequestWorkers 150
80	MaxRequestsPerChild 1000	80	MaxRequestsPerChild 1000
81	ExpireTimeout 1800	81	ExpireTimeout 1800
82		82
Lines 92-98 PidFile /var/run/apache2.pid Link Here
92	StartServers 5	92	StartServers 5
93	MinSpareServers 5	93	MinSpareServers 5
94	MaxSpareServers 10	94	MaxSpareServers 10
95	MaxClients 150	95	MaxRequestWorkers 150
96	MaxRequestsPerChild 10000	96	MaxRequestsPerChild 10000
97	</IfModule>	97	</IfModule>
98		98

Lines 31-38 DocumentRoot "/var/www/localhost/htdocs" Link Here

(-)conf/vhosts.d/default_vhost.include (-4 / +2 lines)
31	AllowOverride All	31	AllowOverride All
32		32
33	# Controls who can get stuff from this server.	33	# Controls who can get stuff from this server.
34	Order allow,deny	34	Require all granted
35	Allow from all
36	</Directory>	35	</Directory>
37		36
38	<IfModule alias_module>	37	<IfModule alias_module>
Lines 66-73 DocumentRoot "/var/www/localhost/htdocs" Link Here
66	<Directory "/var/www/localhost/cgi-bin">	65	<Directory "/var/www/localhost/cgi-bin">
67	AllowOverride None	66	AllowOverride None
68	Options None	67	Options None
69	Order allow,deny	68	Require all granted
70	Allow from all
71	</Directory>	69	</Directory>
72		70
73	# vim: ts=4 filetype=apache	71	# vim: ts=4 filetype=apache

Lines 50-57 Link Here

(-)docs/ip-based-vhost.conf.example (-8 / +4 lines)
50	Options Indexes FollowSymLinks	50	Options Indexes FollowSymLinks
51	AllowOverride None	51	AllowOverride None
52		52
53	Order allow,deny	53	Require all granted
54	Allow from all
55		54
56	</Directory>	55	</Directory>
57		56
Lines 65-72 Link Here
65	#<Directory "/var/www/example.com/cgi-bin">	64	#<Directory "/var/www/example.com/cgi-bin">
66	# AllowOverride None	65	# AllowOverride None
67	# Options None	66	# Options None
68	# Order allow,deny	67	# Require all granted
69	# Allow from all
70	#</Directory>	68	#</Directory>
71		69
72	# If you have multiple users on this system, each with their own vhost,	70	# If you have multiple users on this system, each with their own vhost,
Lines 88-95 Link Here
88	# Options IncludesNoExec	86	# Options IncludesNoExec
89	# AddOutputFilter Includes html	87	# AddOutputFilter Includes html
90	# AddHandler type-map var	88	# AddHandler type-map var
91	# Order allow,deny	89	# Require all granted
92	# Allow from all
93	# </Directory>	90	# </Directory>
94	#</IfDefine ERRORDOCS>	91	#</IfDefine ERRORDOCS>
95		92
Lines 100-107 Link Here
100	#<Directory "/var/www/example.com/icons/">	97	#<Directory "/var/www/example.com/icons/">
101	# Options Indexes MultiViews	98	# Options Indexes MultiViews
102	# AllowOverride None	99	# AllowOverride None
103	# Order allow,deny	100	# Require all granted
104	# Allow from all
105	#</Directory>	101	#</Directory>
106		102
107	# Create a logfile for this vhost	103	# Create a logfile for this vhost

Lines 23-39 Link Here

(-)docs/name-based-vhost.conf.example (-18 / +5 lines)
23	#	23	#
24	# If you want to use a defintion other then the default, you should remove	24	# If you want to use a defintion other then the default, you should remove
25	# -D DEFAULT_VHOST from APACHE2_OPTS in /etc/conf.d/apache2.	25	# -D DEFAULT_VHOST from APACHE2_OPTS in /etc/conf.d/apache2.
26	#
27	# All requests (on any IP address) to port 80 will be handled by Virtual Hosts
28	# This is the default setting in Gentoo:
29	#NameVirtualHost *:80
30	#
31	# Only requests on this IP address on port 80 will be handled by Virtual Hosts
32	# (note: you may need to modify/add a Listen directive in httpd.conf)
33	#NameVirtualHost 1.2.3.4:80
34		26
35	# The actual virtual host definition. Note that the *:80 MUST match whatever	27	# The actual virtual host definition.
36	# is set for NameVirtualHost
37	<VirtualHost *:80>	28	<VirtualHost *:80>
38	# ServerName and ServerAlias are how the server determines which virtual	29	# ServerName and ServerAlias are how the server determines which virtual
39	# host should be used.	30	# host should be used.
Lines 70-77 Link Here
70	Options Indexes FollowSymLinks	61	Options Indexes FollowSymLinks
71	AllowOverride None	62	AllowOverride None
72		63
73	Order allow,deny	64	Require all granted
74	Allow from all
75	</Directory>	65	</Directory>
76		66
77	# By default cgi-bin points to the global cgi-bin in /var/www/localhost	67	# By default cgi-bin points to the global cgi-bin in /var/www/localhost
Lines 84-91 Link Here
84	#<Directory "/var/www/example.com/cgi-bin">	74	#<Directory "/var/www/example.com/cgi-bin">
85	# AllowOverride None	75	# AllowOverride None
86	# Options None	76	# Options None
87	# Order allow,deny	77	# Require all granted
88	# Allow from all
89	#</Directory>	78	#</Directory>
90		79
91	# If you have multiple users on this system, each with their own vhost,	80	# If you have multiple users on this system, each with their own vhost,
Lines 107-114 Link Here
107	# Options IncludesNoExec	96	# Options IncludesNoExec
108	# AddOutputFilter Includes html	97	# AddOutputFilter Includes html
109	# AddHandler type-map var	98	# AddHandler type-map var
110	# Order allow,deny	99	# Require all granted
111	# Allow from all
112	# </Directory>	100	# </Directory>
113	#</IfDefine ERRORDOCS>	101	#</IfDefine ERRORDOCS>
114		102
Lines 119-126 Link Here
119	#<Directory "/var/www/example.com/icons/">	107	#<Directory "/var/www/example.com/icons/">
120	# Options Indexes MultiViews	108	# Options Indexes MultiViews
121	# AllowOverride None	109	# AllowOverride None
122	# Order allow,deny	110	# Require all granted
123	# Allow from all
124	#</Directory>	111	#</Directory>
125		112
126	# Create a logfile for this vhost	113	# Create a logfile for this vhost

Lines 40-47 Link Here

(-)docs/ssl-vhost.conf.example (-12 / +4 lines)
40	Options Indexes FollowSymLinks	40	Options Indexes FollowSymLinks
41	AllowOverride None	41	AllowOverride None
42		42
43	Order allow,deny	43	Require all granted
44	Allow from all
45	</Directory>	44	</Directory>
46		45
47	# By default cgi-bin points to the global cgi-bin in /var/www/localhost	46	# By default cgi-bin points to the global cgi-bin in /var/www/localhost
Lines 54-61 Link Here
54	#<Directory "/var/www/example.com/cgi-bin">	53	#<Directory "/var/www/example.com/cgi-bin">
55	# AllowOverride None	54	# AllowOverride None
56	# Options None	55	# Options None
57	# Order allow,deny	56	# Require all granted
58	# Allow from all
59	#</Directory>	57	#</Directory>
60		58
61	# If you have multiple users on this system, each with their own vhost,	59	# If you have multiple users on this system, each with their own vhost,
Lines 77-84 Link Here
77	# Options IncludesNoExec	75	# Options IncludesNoExec
78	# AddOutputFilter Includes html	76	# AddOutputFilter Includes html
79	# AddHandler type-map var	77	# AddHandler type-map var
80	# Order allow,deny	78	# Require all granted
81	# Allow from all
82	# </Directory>	79	# </Directory>
83	#</IfDefine ERRORDOCS>	80	#</IfDefine ERRORDOCS>
84		81
Lines 91-98 Link Here
91	#<Directory "/var/www/example.com/icons/">	88	#<Directory "/var/www/example.com/icons/">
92	# Options Indexes MultiViews	89	# Options Indexes MultiViews
93	# AllowOverride None	90	# AllowOverride None
94	# Order allow,deny	91	# Require all granted
95	# Allow from all
96	#</Directory>	92	#</Directory>
97		93
98	# Create a logfile for this vhost	94	# Create a logfile for this vhost
Lines 108-117 Link Here
108		104
109	# If you want to force SSL for a virtualhost, you can uncomment this section	105	# If you want to force SSL for a virtualhost, you can uncomment this section
110		106
111	# Make sure there is a proper NameVirtualHost already setup, if not, you
112	# can uncomment this one. See name-based-vhost.conf.example for details.
113	#NameVirtualHost *:80
114
115	# You can optionally use the IP address here instead, if you want every	107	# You can optionally use the IP address here instead, if you want every
116	# connection to this IP address to be forced to SSL	108	# connection to this IP address to be forced to SSL
117	#<VirtualHost *:80>	109	#<VirtualHost *:80>