Author: psz Date: Thu Nov 26 10:26:04 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- fixes in NameVirtualHost conflict with mod_ssl
- addition of example virtual host config file
- addition of dedicated vhost root directory
- rel 11
---- Files affected:
packages/apache:
apache-httpd.conf (1.54 -> 1.55) , apache.spec (1.588 -> 1.589) ,
apache-example.net.conf (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/apache/apache-httpd.conf
diff -u packages/apache/apache-httpd.conf:1.54
packages/apache/apache-httpd.conf:1.55
--- packages/apache/apache-httpd.conf:1.54 Wed Nov 25 06:54:12 2009
+++ packages/apache/apache-httpd.conf Thu Nov 26 11:25:58 2009
@@ -100,8 +100,8 @@
# See also the BindAddress entry.
# Setup default vhost (first one defined in config) and include vhosts
configuration
-NameVirtualHost 0.0.0.0
-<VirtualHost 0.0.0.0>
+NameVirtualHost *:80
+<VirtualHost *:80>
ServerName localhost
# ServerAdmin webmas...@host.example.com
# DocumentRoot /www/docs/host.example.com
================================================================
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.588 packages/apache/apache.spec:1.589
--- packages/apache/apache.spec:1.588 Tue Nov 10 06:28:51 2009
+++ packages/apache/apache.spec Thu Nov 26 11:25:58 2009
@@ -42,7 +42,7 @@
Summary(tr.UTF-8): Lider WWW tarayıcı
Name: apache
Version: 2.2.14
-Release: 10
+Release: 11
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -75,6 +75,7 @@
Source26: %{name}-mod_log_config.conf
Source27: %{name}-mod_mime_magic.conf
Source28: %{name}-mod_cache.conf
+Source29: %{name}-example.net.conf
Patch0: %{name}-configdir_skip_backups.patch
Patch1: %{name}-layout.patch
Patch2: %{name}-suexec.patch
@@ -1884,7 +1885,7 @@
install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
$RPM_BUILD_ROOT%{_var}/{log/{httpd,archive/httpd},{run,cache}/httpd,lock/mod_dav}
\
$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d,vhosts.d} \
- $RPM_BUILD_ROOT%{_datadir}/cgi-bin
+ $RPM_BUILD_ROOT%{_datadir}/{cgi-bin,vhosts}
# prefork is default one
%{__make} -C buildmpm-prefork install \
@@ -1939,6 +1940,7 @@
cp -a %{SOURCE20} $CFG/16_mod_userdir.conf
cp -a %{SOURCE21} $CFG/10_mpm.conf
cp -a %{SOURCE22} $CFG/20_languages.conf
+cp -a %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/vhosts.d/example.net.conf
echo "LoadModule alias_module modules/mod_alias.so" > $CFG/00_mod_alias.conf
echo "LoadModule authn_file_module modules/mod_authn_file.so" >
$CFG/00_mod_authn_file.conf
@@ -2303,6 +2305,7 @@
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_common.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mpm.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/vhosts.d/example.net.conf
%attr(640,root,root) %{_sysconfdir}/magic
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/sysconfig/httpd
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/logrotate.d/*
@@ -2326,6 +2329,7 @@
%dir %{_datadir}/cgi-bin
%dir %{_datadir}/html
+%dir %{_datadir}/vhosts
%{_datadir}/icons
%files doc -f manual.files
@@ -2732,6 +2736,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.589 2009/11/26 10:25:58 psz
+- fixes in NameVirtualHost conflict with mod_ssl
+- addition of example virtual host config file
+- addition of dedicated vhost root directory
+- rel 11
+
Revision 1.588 2009/11/10 05:28:51 glen
- release 10
================================================================
Index: packages/apache/apache-example.net.conf
diff -u /dev/null packages/apache/apache-example.net.conf:1.1
--- /dev/null Thu Nov 26 11:26:04 2009
+++ packages/apache/apache-example.net.conf Thu Nov 26 11:25:58 2009
@@ -0,0 +1,10 @@
+# This is example config file for virtual host "example.net"
+
+#<VirtualHost *:80>
+# ServerName www.example.net
+# ServerAlias example.net
+# ServerAdmin webmas...@example.net
+# DocumentRoot /home/services/vhosts/example.net
+# ErrorLog logs/example.net-error_log
+# TransferLog logs/example.net-access_log
+#</VirtualHost>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-httpd.conf?r1=1.54&r2=1.55&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.588&r2=1.589&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
