Hello community,
here is the log from the commit of package yast2-http-server
checked in at Thu Nov 23 15:30:25 CET 2006.
--------
--- yast2-http-server/yast2-http-server.changes 2006-11-20 10:05:22.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-http-server/yast2-http-server.changes 2006-11-22 16:09:46.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 22 16:02:18 CET 2006 - mzugec@suse.cz
+
+- #200805 - YaST Fails to Enable UserDir
+- 2.14.5
+
+-------------------------------------------------------------------
Old:
----
yast2-http-server-2.14.4.tar.bz2
New:
----
yast2-http-server-2.14.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.pbrhGe/_old 2006-11-23 15:29:27.000000000 +0100
+++ /var/tmp/diff_new_pack.pbrhGe/_new 2006-11-23 15:29:27.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-http-server (Version 2.14.4)
+# spec file for package yast2-http-server (Version 2.14.5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-http-server
-Version: 2.14.4
+Version: 2.14.5
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-http-server-2.14.4.tar.bz2
+Source0: yast2-http-server-2.14.5.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt libzio perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-network yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
Requires: yast2 yast2-network yast2-firewall yast2-perl-bindings libzio yast2-dns-server
@@ -34,7 +34,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-http-server-2.14.4
+%setup -n yast2-http-server-2.14.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -70,6 +70,9 @@
%doc %{prefix}/share/doc/packages/yast2-http-server
%changelog -n yast2-http-server
+* Wed Nov 22 2006 - mzugec@suse.cz
+- #200805 - YaST Fails to Enable UserDir
+- 2.14.5
* Mon Nov 20 2006 - mzugec@suse.cz
- #220756 - yast2 http-server does not accept any servername
- 2.14.4
++++++ yast2-http-server-2.14.4.tar.bz2 -> yast2-http-server-2.14.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.14.4/VERSION new/yast2-http-server-2.14.5/VERSION
--- old/yast2-http-server-2.14.4/VERSION 2006-11-20 09:57:09.000000000 +0100
+++ new/yast2-http-server-2.14.5/VERSION 2006-11-22 16:01:51.000000000 +0100
@@ -1 +1 @@
-2.14.4
+2.14.5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.14.4/configure new/yast2-http-server-2.14.5/configure
--- old/yast2-http-server-2.14.4/configure 2006-11-20 09:38:45.000000000 +0100
+++ new/yast2-http-server-2.14.5/configure 2006-11-22 13:48:21.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-http-server 2.14.3.
+# Generated by GNU Autoconf 2.59 for yast2-http-server 2.14.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-http-server'
PACKAGE_TARNAME='yast2-http-server'
-PACKAGE_VERSION='2.14.3'
-PACKAGE_STRING='yast2-http-server 2.14.3'
+PACKAGE_VERSION='2.14.4'
+PACKAGE_STRING='yast2-http-server 2.14.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-http-server 2.14.3 to adapt to many kinds of systems.
+\`configure' configures yast2-http-server 2.14.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-http-server 2.14.3:";;
+ short | recursive ) echo "Configuration of yast2-http-server 2.14.4:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-http-server configure 2.14.3
+yast2-http-server configure 2.14.4
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-http-server $as_me 2.14.3, which was
+It was created by yast2-http-server $as_me 2.14.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-http-server'
- VERSION='2.14.3'
+ VERSION='2.14.4'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.14.3"
+VERSION="2.14.4"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-http-server $as_me 2.14.3, which was
+This file was extended by yast2-http-server $as_me 2.14.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-http-server config.status 2.14.3
+yast2-http-server config.status 2.14.4
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.14.4/configure.in new/yast2-http-server-2.14.5/configure.in
--- old/yast2-http-server-2.14.4/configure.in 2006-11-20 09:38:39.000000000 +0100
+++ new/yast2-http-server-2.14.5/configure.in 2006-11-22 13:48:15.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-http-server, 2.14.3, http://bugs.opensuse.org/, yast2-http-server)
+AC_INIT(yast2-http-server, 2.14.4, http://bugs.opensuse.org/, yast2-http-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.3"
+VERSION="2.14.4"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.14.4/src/HttpServerWidgets.ycp new/yast2-http-server-2.14.5/src/HttpServerWidgets.ycp
--- old/yast2-http-server-2.14.4/src/HttpServerWidgets.ycp 2006-11-20 09:27:22.000000000 +0100
+++ new/yast2-http-server-2.14.5/src/HttpServerWidgets.ycp 2006-11-22 16:08:30.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Stanislav Visnovsky
*
- * $Id: HttpServerWidgets.ycp 34454 2006-11-20 08:25:35Z mzugec $
+ * $Id: HttpServerWidgets.ycp 34563 2006-11-22 15:08:27Z mzugec $
*/
{
@@ -320,7 +320,7 @@
//symbol showAccessLogPopup (any key, map event);
//symbol showErrorLogPopup (any key, map event);
-list <string> host_ids = nil;
+//list <string> host_ids = nil;
//void OverviewInit (string widget) { }
@@ -943,19 +943,32 @@
global void DirStore (string key, map event)
{
list< map > options = [];
-
+ boolean dir_before=false;
list< map > host = YaST::HTTPDData::GetHost(currenthost);
foreach (map option, host, ``{
if ( option["KEY"]:"unknown" == "_SECTION" && option["SECTIONNAME"]:"unknown" == "Directory"
&& option["SECTIONPARAM"]:"unknown" == dir_value)
{
+ dir_before = true;
list < map > newlist = [];
foreach(integer key, map value, host_options, {newlist = add(newlist, value);});
option["VALUE"] = newlist;
}
options = add(options, option);
});
+ if (!dir_before){
+
+ list < map > newlist = [];
+ foreach(integer key, map value, host_options, {newlist = add(newlist, value);});
+// options = add(options, $["VALUE":newlist]);
+ options = add(host, $["KEY":"_SECTION",
+ "SECTIONNAME":"Directory",
+ "SECTIONPARAM":dir_value,
+ "VALUE":newlist]);
+ }
+y2internal("modify %1", options);
YaST::HTTPDData::ModifyHost (currenthost, options );
+y2internal("\n\nget %1", YaST::HTTPDData::GetHost(currenthost));
setHostOptions(nil);
HttpServer::modified = true;
}
@@ -1013,7 +1026,17 @@
$[ "KEY": "ServerName", "VALUE" : servername ],
$[ "KEY": "ServerAdmin", "VALUE" : admin ],
$[ "KEY": "VirtualByName", "VALUE" : virtualbyname ? "1" : "0" ],
- $[ "KEY": "HostIP", "VALUE" : ip ]
+ $[ "KEY": "HostIP", "VALUE" : ip ],
+ $[
+ "KEY" : "_SECTION",
+ "SECTIONNAME": "Directory",
+ "SECTIONPARAM": documentroot,
+ "VALUE" : [
+ $["KEY":"AllowOverride", "VALUE":"None"],
+ $["KEY":"Order", "VALUE":"allow,deny"],
+ $["KEY":"Allow", "VALUE":"from all"]
+ ],
+ "OVERHEAD" : ""]
];
if ( !validate_server (nil, vhost_descr) ) return false;
return true;
@@ -1281,15 +1304,8 @@
if (size(ssl_values)>0) vhost_descr = add(vhost_descr, ssl_values);
- any result = YaST::HTTPDData::CreateHost ( ip["VALUE"]:""+"/"+servername["VALUE"]:"", vhost_descr );
-
- if ( result == nil)
- {
- map error = (map) YaST::HTTPDData::Error ();
- Popup::Error ( error["summary"]:"" );
- } else {
- vhost_descr = YaST::HTTPDData::GetHost(ip["VALUE"]:""+"/"+servername["VALUE"]:"");
+// vhost_descr = YaST::HTTPDData::GetHost(ip["VALUE"]:""+"/"+servername["VALUE"]:"");
string directory_index=(string)UI::QueryWidget(`dir_index, `Value);
if ( size(directory_index)>0 ){
@@ -1300,20 +1316,28 @@
value["SECTIONNAME"]:"" == "Directory" &&
(search(value["SECTIONPARAM"]:"", documentroot["VALUE"]:""))!=nil)
{
- if (size(directory_index)>0)
+// if (size(directory_index)>0)
value["VALUE"]=add(value["VALUE"]:[], $["KEY":"DirectoryIndex", "VALUE":directory_index]);
}
- tmp_descr = add(tmp_descr, value);
+ tmp_descr = add(tmp_descr, value);
+// vhost_descr = add(vhost_descr, value);
});
- if (UI::QueryWidget(`pub_html, `Value)==true) tmp_descr=add(tmp_descr, $["KEY":"UserDir", "VALUE":"public_html"]);
-
+ vhost_descr = tmp_descr;
}
- HttpServer::modified = true;
- vhost_descr = [];
- }
+// }
+ if ( UI::QueryWidget(`pub_html, `Value)==true )
+ vhost_descr=add(vhost_descr, $["KEY":"UserDir", "VALUE":"public_html"]);
+ if ( YaST::HTTPDData::CreateHost ( ip["VALUE"]:""+"/"+servername["VALUE"]:"", vhost_descr )==nil )
+ {
+ map error = (map) YaST::HTTPDData::Error ();
+ Popup::Error ( error["summary"]:"" );
+ }
+ HttpServer::modified = true;
+ vhost_descr = [];
}
+
/**
* Map of widgets for CWM
*/
@@ -2024,7 +2048,7 @@
}
if ( key == "_SECTION" && option["SECTIONPARAM"]:"" == "SSL" )
- {
+ {
host_options[option_counter] = $[
"KEY" : "SSL",
"VALUE" : "",
@@ -2035,12 +2059,24 @@
option_counter = option_counter + 1;
}
-
// skip SECTIONS
if ( key == "_SECTION" )
{
- option_counter = option_counter + 1;
- continue;
+ if (option["SECTIONNAME"]:"" == "IfModule")
+ {
+ host_options[option_counter] = $[
+ "KEY" : option["SECTIONPARAM"]:"",
+ "VALUE" : "",
+ "DATA": option["VALUE"]:[],
+ "OVERHEAD" : option["OVERHEAD"]:""
+ ];
+ res = add (res, option_counter);
+ option_counter = option_counter + 1;
+
+ } else{
+ option_counter = option_counter + 1;
+ continue;
+ }
}
// skip HostIP for default host
else if (currenthost == "main" && key == "HostIP")
@@ -2050,7 +2086,7 @@
continue;
}
else
- {
+ {
host_options[option_counter] = option;
res = add (res, option_counter);
option_counter = option_counter + 1;
@@ -2091,7 +2127,6 @@
res = add (res, option_counter);
option_counter = option_counter + 1;
}
-
return res;
}
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.14.4/src/YaPI/HTTPD.pm new/yast2-http-server-2.14.5/src/YaPI/HTTPD.pm
--- old/yast2-http-server-2.14.4/src/YaPI/HTTPD.pm 2006-11-20 09:27:22.000000000 +0100
+++ new/yast2-http-server-2.14.5/src/YaPI/HTTPD.pm 2006-11-22 13:26:46.000000000 +0100
@@ -494,6 +494,7 @@
my $self = shift;
my $hostid = shift;
my $data = shift;
+ my $params = shift;
my $byname = "";
my $ip = "";
@@ -511,6 +512,15 @@
}
}
+ if ($ip eq '' && $byname eq ''){
+ $ip = $params->{'id'};
+ if ($params->{'type'} eq "ip-based"){
+ $byname = "0";
+ } else {
+ $byname = "1";
+ }
+ }
+
if ($byname eq 0){
push(@{$vhost_files->{'ip-based'}}, {HOSTID => "$ip/$servername", HostIP => $ip, DATA => \@newdata});
@@ -566,8 +576,6 @@
my $self = shift;
my $hostid = shift;
my $data = shift;
-# my $type = "";
-# my $ip = "";
# my @newdata = ();
@@ -580,9 +588,13 @@
# push(@newdata, $row);
# }
# }
+print Dumper($vhost_files->{'ip-based'});
+print Dumper($data);
+my $params = $self->getVhType($hostid);
+print Dumper($params);
$self->deleteVH($hostid);
- $self->createVH($hostid, $data);
+ $self->createVH($hostid, $data, $params);
$self->validateNVH();
}
@@ -890,7 +902,7 @@
my $self = shift;
my @vhosts = ();
- my @vhosts = @{$vhost_files->{'ip-based'}} if (defined $vhost_files->{'ip-based'});
+ @vhosts = @{$vhost_files->{'ip-based'}} if (defined $vhost_files->{'ip-based'});
foreach my $key ( keys(%{$vhost_files}) ) {
switch($key)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org