OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jun-2007 18:24:51
Branch: HEAD Handle: 2007062217244902
Modified files:
openpkg-src/axkit axkit-apache.conf
openpkg-src/cacti cacti-apache.conf cacti.spec
openpkg-src/drupal drupal-apache.conf
openpkg-src/mediawiki mediawiki-apache.conf
openpkg-src/phpbb phpbb-apache.conf
openpkg-src/punbb punbb-apache.conf punbb.spec
Log:
adopt more configs for apache2
Summary:
Revision Changes Path
1.2 +3 -4 openpkg-src/axkit/axkit-apache.conf
1.3 +3 -4 openpkg-src/cacti/cacti-apache.conf
1.39 +1 -1 openpkg-src/cacti/cacti.spec
1.3 +3 -4 openpkg-src/drupal/drupal-apache.conf
1.2 +3 -4 openpkg-src/mediawiki/mediawiki-apache.conf
1.3 +3 -4 openpkg-src/phpbb/phpbb-apache.conf
1.2 +3 -4 openpkg-src/punbb/punbb-apache.conf
1.3 +1 -1 openpkg-src/punbb/punbb.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/axkit/axkit-apache.conf
============================================================================
$ cvs diff -u -r1.1 -r1.2 axkit-apache.conf
--- openpkg-src/axkit/axkit-apache.conf 10 Mar 2007 22:24:48 -0000
1.1
+++ openpkg-src/axkit/axkit-apache.conf 22 Jun 2007 16:24:49 -0000
1.2
@@ -2,14 +2,12 @@
## axkit-apache.conf -- AxKit Apache Custom Configuration
##
-ServerType standalone
ServerRoot @l_prefix@
ServerAdmin root@@[EMAIL PROTECTED]@l_domainname@
ServerName @[EMAIL PROTECTED]@l_domainname@
ServerTokens Prod
User @l_rusr@
Group @l_rgrp@
-Port 8080
Listen 127.0.0.1:8080
# runtime files
@@ -17,6 +15,9 @@
ScoreBoardFile @l_prefix@/var/axkit/run/apache.sb
LockFile @l_prefix@/var/axkit/run/apache.lck
+# include apache-perl
+Include @l_prefix@/etc/apache/apache.d/apache-perl.conf
+
# server behaviour
Timeout 300
KeepAlive on
@@ -62,8 +63,6 @@
SSLMutex sem
SSLSessionCache
shmcb:@l_prefix@/var/axkit/run/apache.scache(512000)
SSLSessionCacheTimeout 300
- SSLLog @l_prefix@/var/axkit/log/apache.ssl.log
- SSLLogLevel warn
SSLCipherSuite
ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
SetEnvIf User-Agent ".*MSIE.*" \
nokeepalive ssl-unclean-shutdown \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cacti/cacti-apache.conf
============================================================================
$ cvs diff -u -r1.2 -r1.3 cacti-apache.conf
--- openpkg-src/cacti/cacti-apache.conf 19 Aug 2003 15:18:30 -0000
1.2
+++ openpkg-src/cacti/cacti-apache.conf 22 Jun 2007 16:24:49 -0000
1.3
@@ -2,14 +2,12 @@
## cacti-apache.conf -- Cacti Apache Custom Configuration
##
-ServerType standalone
ServerRoot @l_prefix@
ServerAdmin root@@[EMAIL PROTECTED]@l_domainname@
ServerName @[EMAIL PROTECTED]@l_domainname@
ServerTokens Prod
User @l_rusr@
Group @l_rgrp@
-Port 8080
Listen 127.0.0.1:8080
# runtime files
@@ -17,6 +15,9 @@
ScoreBoardFile @l_prefix@/var/cacti/run/apache.sb
LockFile @l_prefix@/var/cacti/run/apache.lck
+# include apache-php
+Include @l_prefix@/etc/apache/apache.d/apache-php.conf
+
# server behaviour
Timeout 300
KeepAlive on
@@ -62,8 +63,6 @@
SSLMutex sem
SSLSessionCache
shmcb:@l_prefix@/var/cacti/run/apache.scache(512000)
SSLSessionCacheTimeout 300
- SSLLog @l_prefix@/var/cacti/log/apache.ssl.log
- SSLLogLevel warn
SSLCipherSuite
ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
SetEnvIf User-Agent ".*MSIE.*" \
nokeepalive ssl-unclean-shutdown \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cacti/cacti.spec
============================================================================
$ cvs diff -u -r1.38 -r1.39 cacti.spec
--- openpkg-src/cacti/cacti.spec 18 Apr 2007 21:45:55 -0000 1.38
+++ openpkg-src/cacti/cacti.spec 22 Jun 2007 16:24:49 -0000 1.39
@@ -33,7 +33,7 @@
Group: Monitoring
License: GPL
Version: 0.8.6j
-Release: 20070418
+Release: 20070622
# list of sources
Source0: http://www.cacti.net/downloads/cacti-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal-apache.conf
============================================================================
$ cvs diff -u -r1.2 -r1.3 drupal-apache.conf
--- openpkg-src/drupal/drupal-apache.conf 14 Nov 2005 13:59:54 -0000
1.2
+++ openpkg-src/drupal/drupal-apache.conf 22 Jun 2007 16:24:50 -0000
1.3
@@ -2,14 +2,12 @@
## drupal-apache.conf -- Drupal Apache Custom Configuration
##
-ServerType standalone
ServerRoot @l_prefix@
ServerAdmin root@@[EMAIL PROTECTED]@l_domainname@
ServerName @[EMAIL PROTECTED]@l_domainname@
ServerTokens Prod
User @l_rusr@
Group @l_rgrp@
-Port 80
Listen 127.0.0.1:80
# runtime files
@@ -17,6 +15,9 @@
ScoreBoardFile @l_prefix@/var/drupal/run/apache.sb
LockFile @l_prefix@/var/drupal/run/apache.lck
+# include apache-php
+Include @l_prefix@/etc/apache/apache.d/apache-php.conf
+
# server behaviour
Timeout 300
KeepAlive on
@@ -62,8 +63,6 @@
SSLMutex sem
SSLSessionCache
shmcb:@l_prefix@/var/drupal/run/apache.scache(512000)
SSLSessionCacheTimeout 300
- SSLLog @l_prefix@/var/drupal/log/apache.ssl.log
- SSLLogLevel warn
SSLCipherSuite
ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
SetEnvIf User-Agent ".*MSIE.*" \
nokeepalive ssl-unclean-shutdown \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mediawiki/mediawiki-apache.conf
============================================================================
$ cvs diff -u -r1.1 -r1.2 mediawiki-apache.conf
--- openpkg-src/mediawiki/mediawiki-apache.conf 22 Dec 2006 15:51:14
-0000 1.1
+++ openpkg-src/mediawiki/mediawiki-apache.conf 22 Jun 2007 16:24:50
-0000 1.2
@@ -2,14 +2,12 @@
## mediawiki-apache.conf -- MediaWiki Apache Custom Configuration
##
-ServerType standalone
ServerRoot @l_prefix@
ServerAdmin root@@[EMAIL PROTECTED]@l_domainname@
ServerName @[EMAIL PROTECTED]@l_domainname@
ServerTokens Prod
User @l_rusr@
Group @l_rgrp@
-Port 8080
Listen 127.0.0.1:8080
# runtime files
@@ -17,6 +15,9 @@
ScoreBoardFile @l_prefix@/var/mediawiki/run/apache.sb
LockFile @l_prefix@/var/mediawiki/run/apache.lck
+# include apache-php
+Include @l_prefix@/etc/apache/apache.d/apache-php.conf
+
# server behaviour
Timeout 300
KeepAlive on
@@ -62,8 +63,6 @@
SSLMutex sem
SSLSessionCache
shmcb:@l_prefix@/var/mediawiki/run/apache.scache(512000)
SSLSessionCacheTimeout 300
- SSLLog @l_prefix@/var/mediawiki/log/apache.ssl.log
- SSLLogLevel warn
SSLCipherSuite
ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
SetEnvIf User-Agent ".*MSIE.*" \
nokeepalive ssl-unclean-shutdown \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/phpbb/phpbb-apache.conf
============================================================================
$ cvs diff -u -r1.2 -r1.3 phpbb-apache.conf
--- openpkg-src/phpbb/phpbb-apache.conf 25 Dec 2006 14:47:50 -0000
1.2
+++ openpkg-src/phpbb/phpbb-apache.conf 22 Jun 2007 16:24:50 -0000
1.3
@@ -2,14 +2,12 @@
## phpbb-apache.conf -- phpBB Apache Custom Configuration
##
-ServerType standalone
ServerRoot @l_prefix@
ServerAdmin root@@[EMAIL PROTECTED]@l_domainname@
ServerName @[EMAIL PROTECTED]@l_domainname@
ServerTokens Prod
User @l_rusr@
Group @l_rgrp@
-Port 8080
Listen 127.0.0.1:8080
# runtime files
@@ -17,6 +15,9 @@
ScoreBoardFile @l_prefix@/var/phpbb/run/apache.sb
LockFile @l_prefix@/var/phpbb/run/apache.lck
+# include apache-php
+Include @l_prefix@/etc/apache/apache.d/apache-php.conf
+
# server behaviour
Timeout 300
KeepAlive on
@@ -62,8 +63,6 @@
SSLMutex sem
SSLSessionCache
shmcb:@l_prefix@/var/phpbb/run/apache.scache(512000)
SSLSessionCacheTimeout 300
- SSLLog @l_prefix@/var/phpbb/log/apache.ssl.log
- SSLLogLevel warn
SSLCipherSuite
ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
SetEnvIf User-Agent ".*MSIE.*" \
nokeepalive ssl-unclean-shutdown \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/punbb/punbb-apache.conf
============================================================================
$ cvs diff -u -r1.1 -r1.2 punbb-apache.conf
--- openpkg-src/punbb/punbb-apache.conf 16 Apr 2007 20:28:52 -0000
1.1
+++ openpkg-src/punbb/punbb-apache.conf 22 Jun 2007 16:24:51 -0000
1.2
@@ -2,14 +2,12 @@
## punbb-apache.conf -- PunBB Apache Custom Configuration
##
-ServerType standalone
ServerRoot @l_prefix@
ServerAdmin root@@[EMAIL PROTECTED]@l_domainname@
ServerName @[EMAIL PROTECTED]@l_domainname@
ServerTokens Prod
User @l_rusr@
Group @l_rgrp@
-Port 8080
Listen 127.0.0.1:8080
# runtime files
@@ -17,6 +15,9 @@
ScoreBoardFile @l_prefix@/var/punbb/run/apache.sb
LockFile @l_prefix@/var/punbb/run/apache.lck
+# include apache-php
+Include @l_prefix@/etc/apache/apache.d/apache-php.conf
+
# server behaviour
Timeout 300
KeepAlive on
@@ -62,8 +63,6 @@
SSLMutex sem
SSLSessionCache
shmcb:@l_prefix@/var/punbb/run/apache.scache(512000)
SSLSessionCacheTimeout 300
- SSLLog @l_prefix@/var/punbb/log/apache.ssl.log
- SSLLogLevel warn
SSLCipherSuite
ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
SetEnvIf User-Agent ".*MSIE.*" \
nokeepalive ssl-unclean-shutdown \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/punbb/punbb.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 punbb.spec
--- openpkg-src/punbb/punbb.spec 18 Apr 2007 10:31:06 -0000 1.2
+++ openpkg-src/punbb/punbb.spec 22 Jun 2007 16:24:51 -0000 1.3
@@ -33,7 +33,7 @@
Group: CMS
License: GPL
Version: 1.3snap20070416
-Release: 20070418
+Release: 20070622
# list of sources
Source0: ftp://ftp.openpkg.org/sources/CPY/punbb/punbb-%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
