Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 286885
Collapse All | Expand All

(-)file_not_specified_in_diff (-103 / +102 lines)
Line  Link Here
0
-- conf/httpd.conf
0
++ conf/httpd.conf
Lines 36-42 Link Here
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
ServerRoot "/usr/lib/apache2"
39
ServerRoot "@GENTOO_PORTAGE_EPREFIX@/usr/lib/apache2"
40
40
41
# Dynamic Shared Object (DSO) Support
41
# Dynamic Shared Object (DSO) Support
42
#
42
#
Lines 77-89 Link Here
77
# To know which flag to add to APACHE2_OPTS, look at the first line of the
77
# To know which flag to add to APACHE2_OPTS, look at the first line of the
78
# the file, which will usually be an <IfDefine OPTION> where OPTION is the
78
# the file, which will usually be an <IfDefine OPTION> where OPTION is the
79
# flag to use.
79
# flag to use.
80
Include /etc/apache2/modules.d/*.conf
80
Include @GENTOO_PORTAGE_EPREFIX@/etc/apache2/modules.d/*.conf
81
81
82
# Virtual-host support
82
# Virtual-host support
83
#
83
#
84
# Gentoo has made using virtual-hosts easy. In /etc/apache2/vhosts.d/ we
84
# Gentoo has made using virtual-hosts easy. In /etc/apache2/vhosts.d/ we
85
# include a default vhost (enabled by adding -D DEFAULT_VHOST to
85
# include a default vhost (enabled by adding -D DEFAULT_VHOST to
86
# APACHE2_OPTS in /etc/conf.d/apache2).
86
# APACHE2_OPTS in /etc/conf.d/apache2).
87
Include /etc/apache2/vhosts.d/*.conf
87
Include @GENTOO_PORTAGE_EPREFIX@/etc/apache2/vhosts.d/*.conf
88
88
89
# vim: ts=4 filetype=apache
89
# vim: ts=4 filetype=apache
90
-- scripts/apache2ctl
90
++ scripts/apache2ctl
Lines 1-2 Link Here
1
#!/bin/sh
1
#!@GENTOO_PORTAGE_EPREFIX@/bin/sh
2
exec /etc/init.d/apache2 "$@"
2
exec @GENTOO_PORTAGE_EPREFIX@/etc/init.d/apache2 "$@"
3
-- scripts/gentestcrt.sh
3
++ scripts/gentestcrt.sh
Lines 1-4 Link Here
1
#!/bin/sh
1
#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
2
##
2
##
3
##  gentestcrt -- Create self-signed test certificate
3
##  gentestcrt -- Create self-signed test certificate
4
##  (C) 2001 Jean-Michel Dault <jmdault@mandrakesoft.com> and Mandrakesoft
4
##  (C) 2001 Jean-Michel Dault <jmdault@mandrakesoft.com> and Mandrakesoft
Lines 6-12 Link Here
6
##
6
##
7
7
8
#   external tools
8
#   external tools
9
openssl="/usr/bin/openssl"
9
openssl="@GENTOO_PORTAGE_EPREFIX@/usr/bin/openssl"
10
10
11
#   some optional terminal sequences
11
#   some optional terminal sequences
12
case $TERM in
12
case $TERM in
Lines 28-36 Link Here
28
#   (do not use /dev/random here, because this device 
28
#   (do not use /dev/random here, because this device 
29
#   doesn't work as expected on all platforms)
29
#   doesn't work as expected on all platforms)
30
randfiles=''
30
randfiles=''
31
for file in /var/log/messages /var/adm/messages \
31
for file in @GENTOO_PORTAGE_EPREFIX@/var/log/messages @GENTOO_PORTAGE_EPREFIX@/var/adm/messages \
32
            /kernel /vmunix /vmlinuz \
32
            @GENTOO_PORTAGE_EPREFIX@/etc/hosts @GENTOO_PORTAGE_EPREFIX@/etc/resolv.conf; do
33
            /etc/hosts /etc/resolv.conf; do
34
    if [ -f $file ]; then
33
    if [ -f $file ]; then
35
        if [ ".$randfiles" = . ]; then
34
        if [ ".$randfiles" = . ]; then
36
            randfiles="$file"
35
            randfiles="$file"
37
-- docs/ip-based-vhost.conf.example
36
++ docs/ip-based-vhost.conf.example
Lines 41-50 Link Here
41
	# Note that if you put the directory anywhere other then under /var/www
41
	# Note that if you put the directory anywhere other then under /var/www
42
	# you may run into problems with suexec and cgi scripts.
42
	# you may run into problems with suexec and cgi scripts.
43
	#
43
	#
44
	DocumentRoot "/var/www/example.com/htdocs"
44
	DocumentRoot "@GENTOO_PORTAGE_EPREFIX@/var/www/example.com/htdocs"
45
45
46
	# This should match the DocumentRoot above
46
	# This should match the DocumentRoot above
47
	<Directory "/var/www/example.com/htdocs">
47
	<Directory "@GENTOO_PORTAGE_EPREFIX@/var/www/example.com/htdocs">
48
48
49
		# Some sane defaults - see httpd.conf for details
49
		# Some sane defaults - see httpd.conf for details
50
		Options Indexes FollowSymLinks
50
		Options Indexes FollowSymLinks
Lines 105-111 Link Here
105
	#</Directory>
105
	#</Directory>
106
106
107
	# Create a logfile for this vhost
107
	# Create a logfile for this vhost
108
	CustomLog /var/log/apache2/example.com.log combined
108
	CustomLog @GENTOO_PORTAGE_EPREFIX@/var/log/apache2/example.com.log combined
109
</VirtualHost>
109
</VirtualHost>
110
110
111
# vim: ts=4 filetype=apache
111
# vim: ts=4 filetype=apache
112
-- docs/name-based-vhost.conf.example
112
++ docs/name-based-vhost.conf.example
Lines 62-71 Link Here
62
	# Note that if you put the directory anywhere other then under /var/www
62
	# Note that if you put the directory anywhere other then under /var/www
63
	# you may run into problems with suexec and cgi scripts.
63
	# you may run into problems with suexec and cgi scripts.
64
	#
64
	#
65
	DocumentRoot "/var/www/example.com/htdocs"
65
	DocumentRoot "@GENTOO_PORTAGE_EPREFIX@/var/www/example.com/htdocs"
66
66
67
	# This should match the DocumentRoot above
67
	# This should match the DocumentRoot above
68
	<Directory "/var/www/example.com/htdocs">
68
	<Directory "@GENTOO_PORTAGE_EPREFIX@/var/www/example.com/htdocs">
69
		# Some sane defaults - see httpd.conf for details
69
		# Some sane defaults - see httpd.conf for details
70
		Options Indexes FollowSymLinks
70
		Options Indexes FollowSymLinks
71
		AllowOverride None
71
		AllowOverride None
Lines 124-130 Link Here
124
	#</Directory>
124
	#</Directory>
125
	
125
	
126
	# Create a logfile for this vhost
126
	# Create a logfile for this vhost
127
	CustomLog /var/log/apache2/example.com.log combined
127
	CustomLog @GENTOO_PORTAGE_EPREFIX@/var/log/apache2/example.com.log combined
128
</VirtualHost>
128
</VirtualHost>
129
129
130
# vim: ts=4 filetype=apache
130
# vim: ts=4 filetype=apache
131
-- docs/ssl-vhost.conf.example
131
++ docs/ssl-vhost.conf.example
Lines 32-41 Link Here
32
	# Note that if you put the directory anywhere other then under /var/www
32
	# Note that if you put the directory anywhere other then under /var/www
33
	# you may run into problems with suexec and cgi scripts.
33
	# you may run into problems with suexec and cgi scripts.
34
	#
34
	#
35
	DocumentRoot "/var/www/example.com/htdocs-secure"
35
	DocumentRoot "@GENTOO_PORTAGE_EPREFIX@/var/www/example.com/htdocs-secure"
36
36
37
	# This should match the DocumentRoot above
37
	# This should match the DocumentRoot above
38
	<Directory "/var/www/example.com/htdocs-secure">
38
	<Directory "@GENTOO_PORTAGE_EPREFIX@/var/www/example.com/htdocs-secure">
39
		# Some sane defaults - see httpd.conf for details
39
		# Some sane defaults - see httpd.conf for details
40
		Options Indexes FollowSymLinks
40
		Options Indexes FollowSymLinks
41
		AllowOverride None
41
		AllowOverride None
Lines 96-109 Link Here
96
	#</Directory>
96
	#</Directory>
97
97
98
	# Create a logfile for this vhost
98
	# Create a logfile for this vhost
99
	CustomLog /var/log/apache2/example.com.ssl_log combined
99
	CustomLog @GENTOO_PORTAGE_EPREFIX@/var/log/apache2/example.com.ssl_log combined
100
	
100
	
101
	# Turn on SSL
101
	# Turn on SSL
102
	SSLEngine on
102
	SSLEngine on
103
103
104
	# You will need a seperate key and certificate for every vhost
104
	# You will need a seperate key and certificate for every vhost
105
	SSLCertificateFile /etc/apache2/ssl/example.com.crt
105
	SSLCertificateFile @GENTOO_PORTAGE_EPREFIX@/etc/apache2/ssl/example.com.crt
106
	SSLCertificateKeyFile /etc/apache2/ssl/example.com.key
106
	SSLCertificateKeyFile @GENTOO_PORTAGE_EPREFIX@/etc/apache2/ssl/example.com.key
107
</VirtualHost>
107
</VirtualHost>
108
108
109
# If you want to force SSL for a virtualhost, you can uncomment this section
109
# If you want to force SSL for a virtualhost, you can uncomment this section
110
-- patches/config.layout
110
++ patches/config.layout
Lines 1-23 Link Here
1
<Layout Gentoo>
1
<Layout Gentoo>
2
	prefix:          /usr
2
	prefix:          @GENTOO_PORTAGE_EPREFIX@/usr
3
	exec_prefix:     /usr
3
	exec_prefix:     @GENTOO_PORTAGE_EPREFIX@/usr
4
	bindir:          /usr/bin
4
	bindir:          @GENTOO_PORTAGE_EPREFIX@/usr/bin
5
	sbindir:         /usr/sbin
5
	sbindir:         @GENTOO_PORTAGE_EPREFIX@/usr/sbin
6
	libdir:          /usr/lib
6
	libdir:          @GENTOO_PORTAGE_EPREFIX@/usr/lib
7
	libexecdir:      /usr/lib/apache2/modules
7
	libexecdir:      @GENTOO_PORTAGE_EPREFIX@/usr/lib/apache2/modules
8
	mandir:          /usr/share/man
8
	mandir:          @GENTOO_PORTAGE_EPREFIX@/usr/share/man
9
	includedir:      /usr/include/apache2
9
	includedir:      @GENTOO_PORTAGE_EPREFIX@/usr/include/apache2
10
	installbuilddir: /usr/lib/apache2/build
10
	installbuilddir: @GENTOO_PORTAGE_EPREFIX@/usr/lib/apache2/build
11
	datadir:         /var/www/localhost
11
	datadir:         @GENTOO_PORTAGE_EPREFIX@/var/www/localhost
12
	errordir:        /var/www/localhost/error
12
	errordir:        @GENTOO_PORTAGE_EPREFIX@/var/www/localhost/error
13
	iconsdir:        /var/www/localhost/icons
13
	iconsdir:        @GENTOO_PORTAGE_EPREFIX@/var/www/localhost/icons
14
	htdocsdir:       /var/www/localhost/htdocs
14
	htdocsdir:       @GENTOO_PORTAGE_EPREFIX@/var/www/localhost/htdocs
15
	cgidir:          /var/www/localhost/cgi-bin
15
	cgidir:          @GENTOO_PORTAGE_EPREFIX@/var/www/localhost/cgi-bin
16
	manualdir:       /usr/share/doc/version/manual
16
	manualdir:       @GENTOO_PORTAGE_EPREFIX@/usr/share/doc/version/manual
17
	sysconfdir:      /etc/apache2
17
	sysconfdir:      @GENTOO_PORTAGE_EPREFIX@/etc/apache2
18
	localstatedir:   /var
18
	localstatedir:   @GENTOO_PORTAGE_EPREFIX@/var
19
	runtimedir:      /var/run
19
	runtimedir:      @GENTOO_PORTAGE_EPREFIX@/var/run
20
	logfiledir:      /var/log/apache2
20
	logfiledir:      @GENTOO_PORTAGE_EPREFIX@/var/log/apache2
21
	proxycachedir:   /var/cache/apache2
21
	proxycachedir:   @GENTOO_PORTAGE_EPREFIX@/var/cache/apache2
22
</Layout>
22
</Layout>
23
23
24
-- scripts/apache2-logrotate
24
++ scripts/apache2-logrotate
Lines 1-11 Link Here
1
# Apache2 logrotate snipet for Gentoo Linux
1
# Apache2 logrotate snipet for Gentoo Linux
2
# Contributes by Chuck Short
2
# Contributes by Chuck Short
3
#
3
#
4
/var/log/apache2/*log {
4
@GENTOO_PORTAGE_EPREFIX@/var/log/apache2/*log {
5
  missingok
5
  missingok
6
  notifempty
6
  notifempty
7
  sharedscripts
7
  sharedscripts
8
  postrotate
8
  postrotate
9
  /etc/init.d/apache2 reload > /dev/null 2>&1 || true
9
  @GENTOO_PORTAGE_EPREFIX@/etc/init.d/apache2 reload > /dev/null 2>&1 || true
10
  endscript
10
  endscript
11
}
11
}
12
-- init/apache2.confd
12
++ init/apache2.confd
Lines 2-8 Link Here
2
# When you install a module it is easy to activate or deactivate the modules
2
# When you install a module it is easy to activate or deactivate the modules
3
# and other features of apache using the APACHE2_OPTS line. Every module should
3
# and other features of apache using the APACHE2_OPTS line. Every module should
4
# install a configuration in /etc/apache2/modules.d. In that file will have an
4
# install a configuration in @GENTOO_PORTAGE_EPREFIX@/etc/apache2/modules.d. In that file will have an
5
# <IfDefine NNN> directive where NNN is the option to enable that module.
5
# <IfDefine NNN> directive where NNN is the option to enable that module.
6
#
6
#
7
# Here are the options available in the default configuration:
7
# Here are the options available in the default configuration:
Lines 28-34 Link Here
28
# will not listen for incomming connections on the approriate port.
28
# will not listen for incomming connections on the approriate port.
29
#
29
#
30
#  DEFAULT_VHOST      Enables name-based virtual hosts, with the default
30
#  DEFAULT_VHOST      Enables name-based virtual hosts, with the default
31
#                     virtual host being in /var/www/localhost/htdocs
31
#                     virtual host being in @GENTOO_PORTAGE_EPREFIX@/var/www/localhost/htdocs
32
#  SSL_DEFAULT_VHOST  Enables default vhost for SSL (you should enable this
32
#  SSL_DEFAULT_VHOST  Enables default vhost for SSL (you should enable this
33
#                     when you enable SSL)
33
#                     when you enable SSL)
34
#
34
#
Lines 41-62 Link Here
41
# YOU HAVE BEEN WARNED.
41
# YOU HAVE BEEN WARNED.
42
# PID file
42
# PID file
43
#PIDFILE=/var/run/apache2.pid
43
#PIDFILE=@GENTOO_PORTAGE_EPREFIX@/var/run/apache2.pid
44
# timeout for startup/shutdown checks
44
# timeout for startup/shutdown checks
45
#TIMEOUT=10
45
#TIMEOUT=10
46
# ServerRoot setting
46
# ServerRoot setting
47
#SERVERROOT=/usr/lib/apache2
47
#SERVERROOT=@GENTOO_PORTAGE_EPREFIX@/usr/lib/apache2
48
# Configuration file location
48
# Configuration file location
49
# - If this does NOT start with a '/', then it is treated relative to
49
# - If this does NOT start with a '/', then it is treated relative to
50
# $SERVERROOT by Apache
50
# $SERVERROOT by Apache
51
#CONFIGFILE=/etc/apache2/httpd.conf
51
#CONFIGFILE=@GENTOO_PORTAGE_EPREFIX@/etc/apache2/httpd.conf
52
# Location to log startup errors to
52
# Location to log startup errors to
53
# They are normally dumped to your terminal.
53
# They are normally dumped to your terminal.
54
#STARTUPERRORLOG="/var/log/apache2/startuperror.log"
54
#STARTUPERRORLOG="@GENTOO_PORTAGE_EPREFIX@/var/log/apache2/startuperror.log"
55
# A command that outputs a formatted text version of the HTML at the URL
55
# A command that outputs a formatted text version of the HTML at the URL
56
# of the command line. Designed for lynx, however other programs may work.
56
# of the command line. Designed for lynx, however other programs may work.
57
-- init/apache2.initd
57
++ init/apache2.initd
Lines 1-4 Link Here
1
#!/sbin/runscript
1
#!@GENTOO_PORTAGE_EPREFIX@/sbin/runscript
2
# Copyright 1999-2007 Gentoo Foundation
2
# Copyright 1999-2007 Gentoo Foundation
3
# Distributed under the terms of the GNU General Public License v2
3
# Distributed under the terms of the GNU General Public License v2
Lines 20-32 Link Here
20
	SERVERROOT="${SERVERROOT:-/usr/lib/apache2}"
20
	SERVERROOT="${SERVERROOT:-@GENTOO_PORTAGE_EPREFIX@/usr/lib/apache2}"
21
	CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}"
21
	CONFIGFILE="${CONFIGFILE:-@GENTOO_PORTAGE_EPREFIX@/etc/apache2/httpd.conf}"
Lines 37-43 Link Here
37
	APACHE2="/usr/sbin/apache2"
37
	APACHE2="@GENTOO_PORTAGE_EPREFIX@/usr/sbin/apache2"
38
}
38
}
39
checkconfig() {
39
checkconfig() {
Lines 56-62 Link Here
56
start() {
56
start() {
57
	[ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache
57
	[ -f @GENTOO_PORTAGE_EPREFIX@/var/log/apache2/ssl_scache ] && rm @GENTOO_PORTAGE_EPREFIX@/var/log/apache2/ssl_scache
58
-- conf/vhosts.d/00_default_ssl_vhost.conf
58
++ conf/vhosts.d/00_default_ssl_vhost.conf
Lines 10-20 Link Here
10
10
11
<VirtualHost _default_:443>
11
<VirtualHost _default_:443>
12
	Include /etc/apache2/vhosts.d/default_vhost.include
12
	Include @GENTOO_PORTAGE_EPREFIX@/etc/apache2/vhosts.d/default_vhost.include
13
	ErrorLog /var/log/apache2/ssl_error_log
13
	ErrorLog @GENTOO_PORTAGE_EPREFIX@/var/log/apache2/ssl_error_log
14
14
15
	<IfModule log_config_module>
15
	<IfModule log_config_module>
16
		TransferLog /var/log/apache2/ssl_access_log
16
		TransferLog @GENTOO_PORTAGE_EPREFIX@/var/log/apache2/ssl_access_log
17
	</IfModule>
17
	</IfModule>
18
18
19
	## SSL Engine Switch:
19
	## SSL Engine Switch:
Lines 32-38 Link Here
32
	# kill -HUP will prompt again. Keep in mind that if you have both an RSA
32
	# kill -HUP will prompt again. Keep in mind that if you have both an RSA
33
	# and a DSA certificate you can configure both in parallel (to also allow
33
	# and a DSA certificate you can configure both in parallel (to also allow
34
	# the use of DSA ciphers, etc.)
34
	# the use of DSA ciphers, etc.)
35
	SSLCertificateFile /etc/apache2/ssl/server.crt
35
	SSLCertificateFile @GENTOO_PORTAGE_EPREFIX@/etc/apache2/ssl/server.crt
36
	#SSLCertificateFile /etc/apache2/ssl/server-dsa.crt
36
	#SSLCertificateFile /etc/apache2/ssl/server-dsa.crt
37
	
37
	
38
	## Server Private Key:
38
	## Server Private Key:
Lines 40-46 Link Here
40
	# point at the key file. Keep in mind that if you've both a RSA and a DSA
40
	# point at the key file. Keep in mind that if you've both a RSA and a DSA
41
	# private key you can configure both in parallel (to also allow the use of
41
	# private key you can configure both in parallel (to also allow the use of
42
	# DSA ciphers, etc.)
42
	# DSA ciphers, etc.)
43
	SSLCertificateKeyFile /etc/apache2/ssl/server.key
43
	SSLCertificateKeyFile @GENTOO_PORTAGE_EPREFIX@/etc/apache2/ssl/server.key
44
	#SSLCertificateKeyFile /etc/apache2/ssl/server-dsa.key
44
	#SSLCertificateKeyFile /etc/apache2/ssl/server-dsa.key
45
	
45
	
46
	## Server Certificate Chain:
46
	## Server Certificate Chain:
Lines 130-136 Link Here
130
		SSLOptions +StdEnvVars
130
		SSLOptions +StdEnvVars
131
	</FilesMatch>
131
	</FilesMatch>
132
132
133
	<Directory "/var/www/localhost/cgi-bin">
133
	<Directory "@GENTOO_PORTAGE_EPREFIX@/var/www/localhost/cgi-bin">
134
		SSLOptions +StdEnvVars
134
		SSLOptions +StdEnvVars
135
	</Directory>
135
	</Directory>
136
136
Lines 170-176 Link Here
170
	# The home of a custom SSL log file. Use this when you want a compact 
170
	# The home of a custom SSL log file. Use this when you want a compact 
171
	# non-error SSL logfile on a virtual host basis.
171
	# non-error SSL logfile on a virtual host basis.
172
	<IfModule log_config_module>
172
	<IfModule log_config_module>
173
		CustomLog /var/log/apache2/ssl_request_log \
173
		CustomLog @GENTOO_PORTAGE_EPREFIX@/var/log/apache2/ssl_request_log \
174
			"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
174
			"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
175
	</IfModule>
175
	</IfModule>
176
</VirtualHost>
176
</VirtualHost>
177
-- conf/vhosts.d/00_default_vhost.conf
177
++ conf/vhosts.d/00_default_vhost.conf
Lines 37-43 Link Here
37
# the default.
37
# the default.
38
<VirtualHost *:80>
38
<VirtualHost *:80>
39
	Include /etc/apache2/vhosts.d/default_vhost.include
39
	Include @GENTOO_PORTAGE_EPREFIX@/etc/apache2/vhosts.d/default_vhost.include
40
40
41
	<IfModule mpm_peruser_module>
41
	<IfModule mpm_peruser_module>
42
		ServerEnvironment apache apache
42
		ServerEnvironment apache apache
43
-- conf/vhosts.d/default_vhost.include
43
++ conf/vhosts.d/default_vhost.include
Lines 9-18 Link Here
9
#
9
#
10
# If you change this to something that isn't under /var/www then suexec
10
# If you change this to something that isn't under /var/www then suexec
11
# will no longer work.
11
# will no longer work.
12
DocumentRoot "/var/www/localhost/htdocs"
12
DocumentRoot "@GENTOO_PORTAGE_EPREFIX@/var/www/localhost/htdocs"
13
13
14
# This should be changed to whatever you set DocumentRoot to.
14
# This should be changed to whatever you set DocumentRoot to.
15
<Directory "/var/www/localhost/htdocs">
15
<Directory "@GENTOO_PORTAGE_EPREFIX@/var/www/localhost/htdocs">
16
	# Possible values for the Options directive are "None", "All",
16
	# Possible values for the Options directive are "None", "All",
17
	# or any combination of:
17
	# or any combination of:
18
	#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
18
	#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
Lines 58-69 Link Here
58
	# run by the server when requested rather than as documents sent to the
58
	# run by the server when requested rather than as documents sent to the
59
	# client.  The same rules about trailing "/" apply to ScriptAlias
59
	# client.  The same rules about trailing "/" apply to ScriptAlias
60
	# directives as to Alias.
60
	# directives as to Alias.
61
	ScriptAlias /cgi-bin/ "/var/www/localhost/cgi-bin/"
61
	ScriptAlias /cgi-bin/ "@GENTOO_PORTAGE_EPREFIX@/var/www/localhost/cgi-bin/"
62
</IfModule>
62
</IfModule>
63
63
64
# "/var/www/localhost/cgi-bin" should be changed to whatever your ScriptAliased
64
# "/var/www/localhost/cgi-bin" should be changed to whatever your ScriptAliased
65
# CGI directory exists, if you have that configured.
65
# CGI directory exists, if you have that configured.
66
<Directory "/var/www/localhost/cgi-bin">
66
<Directory "@GENTOO_PORTAGE_EPREFIX@/var/www/localhost/cgi-bin">
67
	AllowOverride None
67
	AllowOverride None
68
	Options None
68
	Options None
69
	Order allow,deny
69
	Order allow,deny
70
-- conf/modules.d/00_apache_manual.conf
70
++ conf/modules.d/00_apache_manual.conf
Lines 3-11 Link Here
3
# The documentation is always available at
3
# The documentation is always available at
4
#  http://httpd.apache.org/docs/2.2/
4
#  http://httpd.apache.org/docs/2.2/
5
<IfDefine MANUAL>
5
<IfDefine MANUAL>
6
AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-VERSION/manual$1"
6
AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "@GENTOO_PORTAGE_EPREFIX@/usr/share/doc/apache-VERSION/manual$1"
7
7
8
<Directory "/usr/share/doc/apache-VERSION/manual">
8
<Directory "@GENTOO_PORTAGE_EPREFIX@/usr/share/doc/apache-VERSION/manual">
9
	Options Indexes
9
	Options Indexes
10
	AllowOverride None
10
	AllowOverride None
11
	Order allow,deny
11
	Order allow,deny
12
-- conf/modules.d/00_error_documents.conf
12
++ conf/modules.d/00_error_documents.conf
Lines 23-31 Link Here
23
# of the setting of ServerSignature.
23
# of the setting of ServerSignature.
24
<IfDefine ERRORDOCS>
24
<IfDefine ERRORDOCS>
25
Alias /error/ "/usr/share/apache2/error/"
25
Alias /error/ "@GENTOO_PORTAGE_EPREFIX@/usr/share/apache2/error/"
26
26
27
<Directory "/usr/share/apache2/error">
27
<Directory "@GENTOO_PORTAGE_EPREFIX@/usr/share/apache2/error">
28
	AllowOverride None
28
	AllowOverride None
29
	Options IncludesNoExec
29
	Options IncludesNoExec
30
	AddOutputFilter Includes html
30
	AddOutputFilter Includes html
31
-- conf/modules.d/00_default_settings.conf
31
++ conf/modules.d/00_default_settings.conf
Lines 67-73 Link Here
67
# container, error messages relating to that virtual host will be
67
# container, error messages relating to that virtual host will be
68
# logged here.  If you *do* define an error logfile for a <VirtualHost>
68
# logged here.  If you *do* define an error logfile for a <VirtualHost>
69
# container, that host's errors will be logged there and not here.
69
# container, that host's errors will be logged there and not here.
70
ErrorLog /var/log/apache2/error_log
70
ErrorLog @GENTOO_PORTAGE_EPREFIX@/var/log/apache2/error_log
71
# LogLevel: Control the number of messages logged to the error_log.
71
# LogLevel: Control the number of messages logged to the error_log.
72
# Possible values include: debug, info, notice, warn, error, crit,
72
# Possible values include: debug, info, notice, warn, error, crit,
73
-- conf/modules.d/00_mod_log_config.conf
73
++ conf/modules.d/00_mod_log_config.conf
Lines 20-26 Link Here
20
# container, they will be logged here.  Contrariwise, if you *do*
20
# container, they will be logged here.  Contrariwise, if you *do*
21
# define per-<VirtualHost> access logfiles, transactions will be
21
# define per-<VirtualHost> access logfiles, transactions will be
22
# logged therein and *not* in this file.
22
# logged therein and *not* in this file.
23
CustomLog /var/log/apache2/access_log common
23
CustomLog @GENTOO_PORTAGE_EPREFIX@/var/log/apache2/access_log common
24
24
25
# If you would like to have agent and referer logfiles,
25
# If you would like to have agent and referer logfiles,
26
# uncomment the following directives.
26
# uncomment the following directives.
27
-- conf/modules.d/00_mod_mime.conf
27
++ conf/modules.d/00_mod_mime.conf
Lines 10-16 Link Here
10
<IfModule mime_module>
10
<IfModule mime_module>
11
# TypesConfig points to the file containing the list of mappings from
11
# TypesConfig points to the file containing the list of mappings from
12
# filename extension to MIME-type.
12
# filename extension to MIME-type.
13
TypesConfig /etc/mime.types
13
TypesConfig @GENTOO_PORTAGE_EPREFIX@/etc/mime.types
14
14
15
# AddType allows you to add to or override the MIME configuration
15
# AddType allows you to add to or override the MIME configuration
16
# file specified in TypesConfig for specific file types.
16
# file specified in TypesConfig for specific file types.
Lines 49-55 Link Here
49
# The mod_mime_magic module allows the server to use various hints from the
49
# The mod_mime_magic module allows the server to use various hints from the
50
# contents of the file itself to determine its type.  The MIMEMagicFile
50
# contents of the file itself to determine its type.  The MIMEMagicFile
51
# directive tells the module where the hint definitions are located.
51
# directive tells the module where the hint definitions are located.
52
MIMEMagicFile /etc/apache2/magic
52
MIMEMagicFile @GENTOO_PORTAGE_EPREFIX@/etc/apache2/magic
53
</IfModule>
53
</IfModule>
54
54
55
# vim: ts=4 filetype=apache
55
# vim: ts=4 filetype=apache
56
-- conf/modules.d/00_mpm.conf
56
++ conf/modules.d/00_mpm.conf
Lines 4-13 Link Here
4
# identification number when it starts.
4
# identification number when it starts.
5
#
5
#
6
# DO NOT CHANGE UNLESS YOU KNOW WHAT YOU ARE DOING
6
# DO NOT CHANGE UNLESS YOU KNOW WHAT YOU ARE DOING
7
PidFile /var/run/apache2.pid
7
PidFile @GENTOO_PORTAGE_EPREFIX@/var/run/apache2.pid
8
# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
8
# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
9
#LockFile /var/run/apache2.lock
9
#LockFile @GENTOO_PORTAGE_EPREFIX@/var/run/apache2.lock
10
# Only one of the below sections will be relevant on your
10
# Only one of the below sections will be relevant on your
11
# installed httpd.  Use "/usr/sbin/apache2 -l" to find out the
11
# installed httpd.  Use "/usr/sbin/apache2 -l" to find out the
12
-- conf/modules.d/40_mod_ssl.conf
12
++ conf/modules.d/40_mod_ssl.conf
Lines 51-57 Link Here
51
# Configure the SSL Session Cache: First the mechanism  to use and second the
51
# Configure the SSL Session Cache: First the mechanism  to use and second the
52
# expiring timeout (in seconds).
52
# expiring timeout (in seconds).
53
#SSLSessionCache		dbm:/var/run/ssl_scache
53
#SSLSessionCache		dbm:/var/run/ssl_scache
54
SSLSessionCache			shmcb:/var/run/ssl_scache(512000)
54
SSLSessionCache			shmcb:@GENTOO_PORTAGE_EPREFIX@/var/run/ssl_scache(512000)
55
SSLSessionCacheTimeout  300
55
SSLSessionCacheTimeout  300
56
56
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
SSLMutex  file:@GENTOO_PORTAGE_EPREFIX@/var/run/ssl_mutex
61
</IfDefine>
61
</IfDefine>
62
62
63
-- conf/modules.d/45_mod_dav.conf
63
++ conf/modules.d/45_mod_dav.conf
Lines 1-5 Link Here
1
<IfDefine DAV>
1
<IfDefine DAV>
2
DavLockDB "/var/lib/dav/lockdb"
2
DavLockDB "@GENTOO_PORTAGE_EPREFIX@/var/lib/dav/lockdb"
3
3
4
# The following directives disable redirects on non-GET requests for
4
# The following directives disable redirects on non-GET requests for
5
# a directory that does not include the trailing slash.  This fixes a
5
# a directory that does not include the trailing slash.  This fixes a
6
-- conf/modules.d/00_mod_autoindex.conf
6
++ conf/modules.d/00_mod_autoindex.conf
Lines 2-10 Link Here
2
<IfModule alias_module>
2
<IfModule alias_module>
3
# We include the /icons/ alias for FancyIndexed directory listings.  If
3
# We include the /icons/ alias for FancyIndexed directory listings.  If
4
# you do not use FancyIndexing, you may comment this out.
4
# you do not use FancyIndexing, you may comment this out.
5
Alias /icons/ "/usr/share/apache2/icons/"
5
Alias /icons/ "@GENTOO_PORTAGE_EPREFIX@/usr/share/apache2/icons/"
6
6
7
<Directory "/usr/share/apache2/icons">
7
<Directory "@GENTOO_PORTAGE_EPREFIX@/usr/share/apache2/icons">
8
	Options Indexes MultiViews
8
	Options Indexes MultiViews
9
	AllowOverride None
9
	AllowOverride None
10
	Order allow,deny
10
	Order allow,deny

Return to bug 286885