OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Aug-2007 11:00:18
Branch: HEAD Handle: 2007080110001400
Modified files:
openpkg-src/apache apache.base apache.conf apache.spec
Log:
move over add-on configuration file inclusion to apache.conf making it
easier to disable add-ons on a temporary basis
Summary:
Revision Changes Path
1.28 +0 -4 openpkg-src/apache/apache.base
1.8 +4 -0 openpkg-src/apache/apache.conf
1.425 +1 -1 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.base
============================================================================
$ cvs diff -u -r1.27 -r1.28 apache.base
--- openpkg-src/apache/apache.base 28 Jun 2007 20:11:59 -0000 1.27
+++ openpkg-src/apache/apache.base 1 Aug 2007 09:00:14 -0000 1.28
@@ -324,7 +324,3 @@
BrowserMatch "^Dreamweaver-WebDAV-SCM1"
redirect-carefully
</IfModule>
-# include Apache add-on configurations
-# (mainly provided by other packages)
-Include "@l_prefix@/etc/apache/apache.d/*.conf"
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.conf
============================================================================
$ cvs diff -u -r1.7 -r1.8 apache.conf
--- openpkg-src/apache/apache.conf 22 Jun 2007 10:54:02 -0000 1.7
+++ openpkg-src/apache/apache.conf 1 Aug 2007 09:00:14 -0000 1.8
@@ -5,6 +5,10 @@
# include Apache default/base configuration
Include "@l_prefix@/etc/apache/apache.base"
+# include Apache add-on configurations
+# (mainly provided by other packages)
+Include "@l_prefix@/etc/apache/apache.d/*.conf"
+
Listen 127.0.0.1:80
NameVirtualHost 127.0.0.1:80
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.424 -r1.425 apache.spec
--- openpkg-src/apache/apache.spec 30 Jul 2007 13:53:42 -0000 1.424
+++ openpkg-src/apache/apache.spec 1 Aug 2007 09:00:14 -0000 1.425
@@ -33,7 +33,7 @@
Group: Web
License: ASF
Version: 2.2.4
-Release: 20070730
+Release: 20070801
# package options
%option with_mpm_prefork yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
