Hello community,
here is the log from the commit of package yast2-http-server for
openSUSE:Factory checked in at 2014-09-17 17:26:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-http-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-http-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-http-server"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-http-server/yast2-http-server.changes
2014-09-09 19:00:38.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-http-server.new/yast2-http-server.changes
2014-09-17 17:27:05.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Sep 16 09:14:59 CEST 2014 - sch...@suse.de
+
+- AutoYaST: Using HostIP which is given in the host name
+ (e.g. *:443/sleposbuilder3.suse.cz.conf) values in order to set
+ VirtualHost in /etc/apache2/vhosts.d/<hostname> correctly.
+ (bnc#895127)
+- 3.1.4
+
+-------------------------------------------------------------------
Old:
----
yast2-http-server-3.1.3.tar.bz2
New:
----
yast2-http-server-3.1.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.0oWmm5/_old 2014-09-17 17:27:06.000000000 +0200
+++ /var/tmp/diff_new_pack.0oWmm5/_new 2014-09-17 17:27:06.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-http-server
-Version: 3.1.3
+Version: 3.1.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-http-server-3.1.3.tar.bz2 -> yast2-http-server-3.1.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-3.1.3/package/yast2-http-server.changes
new/yast2-http-server-3.1.4/package/yast2-http-server.changes
--- old/yast2-http-server-3.1.3/package/yast2-http-server.changes
2014-09-09 10:49:22.000000000 +0200
+++ new/yast2-http-server-3.1.4/package/yast2-http-server.changes
2014-09-16 15:43:09.000000000 +0200
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Tue Sep 16 09:14:59 CEST 2014 - sch...@suse.de
+
+- AutoYaST: Using HostIP which is given in the host name
+ (e.g. *:443/sleposbuilder3.suse.cz.conf) values in order to set
+ VirtualHost in /etc/apache2/vhosts.d/<hostname> correctly.
+ (bnc#895127)
+- 3.1.4
+
+-------------------------------------------------------------------
Tue Sep 9 10:18:02 CEST 2014 - sch...@suse.de
- Checking initialized/defined variables. (bnc#892933)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-3.1.3/package/yast2-http-server.spec
new/yast2-http-server-3.1.4/package/yast2-http-server.spec
--- old/yast2-http-server-3.1.3/package/yast2-http-server.spec 2014-09-09
10:49:22.000000000 +0200
+++ new/yast2-http-server-3.1.4/package/yast2-http-server.spec 2014-09-16
15:43:09.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-http-server
-Version: 3.1.3
+Version: 3.1.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-http-server-3.1.3/src/modules/HttpServer.rb
new/yast2-http-server-3.1.4/src/modules/HttpServer.rb
--- old/yast2-http-server-3.1.3/src/modules/HttpServer.rb 2014-09-09
10:49:22.000000000 +0200
+++ new/yast2-http-server-3.1.4/src/modules/HttpServer.rb 2014-09-16
15:43:09.000000000 +0200
@@ -594,9 +594,18 @@
if row["KEY"] == "main"
default_server = row
else
+ value = row["VALUE"] || []
+ key_split = row["KEY"].split("/")
+ if value.none? {|item| item["KEY"] == "HostIP"} && key_split.size > 1
+ # Set HostIP which is given in the KEY (e.g.
*:443/sleposbuilder3.suse.cz.conf)
+ # values in order to set VirtualHost in
/etc/apache2/vhosts.d/<hostname>
+ # (bnc#895127)
+ host_ip = key_split.first
+ value << {"KEY" => "HostIP", "VALUE" => host_ip}
+ end
YaST::HTTPDData.CreateHost(
row["KEY"] || "",
- row["VALUE"] || []
+ value
)
end
end
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
