+ exec_prefix: $prefix
+ bindir: $prefix/bin
+ sbindir: $prefix/sbin
-+ libexecdir: $prefix/lib/apache
++ libexecdir: $prefix/lib/apache1
+ mandir: $prefix/share/man
-+ sysconfdir: /etc/httpd
-+ datadir: /home/services/httpd
++ sysconfdir: /etc/apache
++ datadir: /home/services/apache
+ iconsdir: $datadir/icons
+ htdocsdir: $datadir/html
+ cgidir: $datadir/cgi-bin
-+ includedir: $prefix/include/apache
++ includedir: $prefix/include/apache1
+ localstatedir: /var
+ runtimedir: $localstatedir/run
-+ logfiledir: $localstatedir/log/httpd
++ logfiledir: $localstatedir/log/apache
+ proxycachedir: $localstatedir/cache/www/apache
+</Layout>
diff -urN apache_1.3.14.orig/src/main/http_main.c apache_1.3.14/src/main/http_main.c
##
-## httpd.conf -- Apache HTTP server configuration file
+## apache.conf -- Apache HTTP server configuration file
##
##### Global Environment
# The file in which the server should record its process identification
# number when it starts.
-PidFile /var/run/httpd.pid
+PidFile /var/run/apache.pid
### Timeout
# The number of seconds before receives and sends time out.
# DISK. The PID of the main server process is automatically appended to
# the filename.
#
-LockFile /var/run/httpd.lock
+LockFile /var/run/apache.lock
### ScoreBoardFile
# File used to store internal server process information. Not all
# file will be created when you run Apache) then you *must* ensure that no
# two invocations of Apache share the same scoreboard file.
-ScoreBoardFile /var/run/httpd.scoreboard
+ScoreBoardFile /var/run/apache.scoreboard
#
# In the standard configuration, the server will process this file,
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
#
-DocumentRoot "/home/services/httpd/html"
+DocumentRoot "/home/services/apache/html"
#
# Each directory to which Apache has access, can be configured with respect
#
# This should be changed to whatever you set DocumentRoot to.
#
-<Directory "/home/services/httpd/html">
+<Directory "/home/services/apache/html">
#
# This may also be "None", "All", or any combination of "Indexes",
# module is part of the server.
#
<IfModule mod_mime_magic.c>
- MIMEMagicFile /etc/httpd/magic
+ MIMEMagicFile /etc/apache/magic
</IfModule>
#
# 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 /var/log/httpd/error_log
+ErrorLog /var/log/apache/error_log
#
# The location and format of the access logfile (Common Logfile Format).
# If you do not define any access logfiles within a <VirtualHost>
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
-CustomLog /var/log/httpd/access_log common
-CustomLog /var/log/httpd/referer_log referer
-CustomLog /var/log/httpd/agent_log agent
+CustomLog /var/log/apache/access_log common
+CustomLog /var/log/apache/referer_log referer
+CustomLog /var/log/apache/agent_log agent
#
# LogLevel: Control the number of messages logged to the error_log.
# require it to be present in the URL. So "/icons" isn't aliased in this
# example, only "/icons/"..
#
-Alias /icons/ "/home/services/httpd/icons/"
+Alias /icons/ "/home/services/apache/icons/"
-<Directory "/home/services/httpd/icons">
+<Directory "/home/services/apache/icons">
Options Indexes MultiViews
AllowOverride None
Order allow,deny
Allow from all
</Directory>
-Alias /manual/ "/home/services/httpd/manual/"
+Alias /manual/ "/home/services/apache/manual/"
-<Directory "/home/services/httpd/manual">
+<Directory "/home/services/apache/manual">
Options Indexes MultiViews
AllowOverride None
order deny,allow
# The same rules about trailing "/" apply to ScriptAlias directives as to
# Alias.
#
-ScriptAlias /cgi-bin/ "/home/services/httpd/cgi-bin/"
+ScriptAlias /cgi-bin/ "/home/services/apache/cgi-bin/"
#
-# "/home/services/httpd/cgi-bin" should be changed to whatever your
+# "/home/services/apache/cgi-bin" should be changed to whatever your
# ScriptAliased CGI directory exists, if you have that configured.
#
-<Directory "/home/services/httpd/cgi-bin">
+<Directory "/home/services/apache/cgi-bin">
AllowOverride None
Options None
Order allow,deny
# N.B.: Many of the environment variables associated with the original
# request will *not* be available to such a script.
-Alias /errordocs/ "/home/services/httpd/errordocs/"
+Alias /errordocs/ "/home/services/apache/errordocs/"
-<Directory /home/services/httpd/errordocs/>
+<Directory /home/services/apache/errordocs/>
AllowOverride none
Options IncludesNoExec FollowSymLinks
</Directory>
# chkconfig: 345 85 15
# description: Apache is a World Wide Web server. It is used to serve \
# HTML files and CGI.
-# processname: httpd
-# pidfile: /var/run/httpd.pid
-# config: /etc/httpd/httpd.conf
+# processname: apache
+# pidfile: /var/run/apache.pid
+# config: /etc/apache/apache.conf
# Source function library
if is_yes "${NETWORKING}"; then
if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
# nls "ERROR: Networking is down. %s can't be run." <service>
- msg_network_down httpd
+ msg_network_down apache
exit 1
fi
else
case "$1" in
start)
# Check if the service is already running?
- if [ ! -f /var/lock/subsys/httpd ]; then
- msg_starting httpd
- daemon httpd $HTTPD_OPTS
+ if [ ! -f /var/lock/subsys/apache ]; then
+ msg_starting apache
+ daemon apache $HTTPD_OPTS
RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/apache
else
- msg_already_running httpd
+ msg_already_running apache
fi
;;
stop)
# Stop daemons.
- if [ -f /var/lock/subsys/httpd ]; then
- msg_stopping httpd
- killproc httpd
- rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
+ if [ -f /var/lock/subsys/apache ]; then
+ msg_stopping apache
+ killproc apache
+ rm -f /var/lock/subsys/apache /var/run/.pid /var/run/apache.loc* >/dev/null 2>&1
else
- msg_not_running httpd
+ msg_not_running apache
fi
;;
status)
- status httpd
+ status apache
RETVAL=$?
- /usr/sbin/httpd -S
+ /usr/sbin/apache -S
;;
restart)
$0 stop
exit $?
;;
reload|force-reload)
- if [ -f /var/lock/subsys/httpd ]; then
- msg_reloading httpd
- killproc httpd -HUP
+ if [ -f /var/lock/subsys/apache ]; then
+ msg_reloading apache
+ killproc apache -HUP
RETVAL=$?
else
- msg_not_running httpd >&2
+ msg_not_running apache >&2
RETVAL=7
fi
;;
graceful)
- if [ -f /var/lock/subsys/httpd ]; then
- msg_reloading httpd
- killproc httpd -USR1
+ if [ -f /var/lock/subsys/apache ]; then
+ msg_reloading apache
+ killproc apache -USR1
RETVAL=$?
else
- msg_not_running httpd >&2
+ msg_not_running apache >&2
RETVAL=7
fi
;;
-/var/log/httpd/access_log {
- olddir /var/log/archiv/httpd
+/var/log/apache/access_log {
+ olddir /var/log/archiv/apache
postrotate
- /etc/rc.d/init.d/httpd graceful > /dev/null 2>&1 || /bin/true
+ /etc/rc.d/init.d/apache graceful > /dev/null 2>&1 || /bin/true
endscript
}
-/var/log/httpd/agent_log {
- olddir /var/log/archiv/httpd
+/var/log/apache/agent_log {
+ olddir /var/log/archiv/apache
postrotate
- /etc/rc.d/init.d/httpd graceful > /dev/null 2>&1 || /bin/true
+ /etc/rc.d/init.d/apache graceful > /dev/null 2>&1 || /bin/true
endscript
}
-/var/log/httpd/error_log {
- olddir /var/log/archiv/httpd
+/var/log/apache/error_log {
+ olddir /var/log/archiv/apache
postrotate
- /etc/rc.d/init.d/httpd graceful > /dev/null 2>&1 || /bin/true
+ /etc/rc.d/init.d/apache graceful > /dev/null 2>&1 || /bin/true
endscript
}
-/var/log/httpd/referer_log {
- olddir /var/log/archiv/httpd
+/var/log/apache/referer_log {
+ olddir /var/log/archiv/apache
postrotate
- /etc/rc.d/init.d/httpd graceful > /dev/null 2>&1 || /bin/true
+ /etc/rc.d/init.d/apache graceful > /dev/null 2>&1 || /bin/true
endscript
}
projects / packages / apache1.git / commitdiff