Author: dfiser
Date: Tue Sep 4 15:37:25 2007
New Revision: 40749
URL: http://svn.opensuse.org/viewcvs/yast?rev=40749&view=rev
Log:
.rnc file is verified - added some comments how to verify it later.
squid.desktop and yast2-squid.spec.in modified beacause of new .rnc file.
Modified summary displayed in autoyast and some little modifications in autoyast client.
Modified:
trunk/squid/src/Squid.ycp
trunk/squid/src/complex.ycp
trunk/squid/src/squid.desktop
trunk/squid/src/squid.rnc
trunk/squid/src/squid_auto.ycp
trunk/squid/yast2-squid.spec.in
Modified: trunk/squid/src/Squid.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=40749&r1=40748&r2=40749&view=diff
==============================================================================
--- trunk/squid/src/Squid.ycp (original)
+++ trunk/squid/src/Squid.ycp Tue Sep 4 15:37:25 2007
@@ -132,7 +132,7 @@
"emulate_httpd_log" : ["off"],
"connect_timeout" : ["2", "minutes"],
- "client_lifetime" : ["1", "day"],
+ "client_lifetime" : ["1", "days"],
"error_directory" : ["/usr/share/squid/errors/English"],
"cache_mgr" : ["webmaster"],
@@ -381,6 +381,7 @@
global void SetServiceEnabled(boolean enabled)
{
+ SetModified();
service_enabled_on_startup = enabled;
}
/******* SERVICE END **/
@@ -1398,19 +1399,30 @@
if (!GetModified()){
summary = Summary::NotConfigured();
}else{
+ // Header
summary = Summary::AddHeader("", _("Squid Cache Proxy"));
+
+ // Start daemon
+ summary = Summary::AddLine(summary, _("Start daemon: ") +
+ "<i>" + (service_enabled_on_startup ? _("When booting") : _("Manually")) + "</i>");
+
+ // Http Ports
summary = Summary::AddLine(summary, _("Configured ports:"));
if (size(http_ports) > 0){
summary = Summary::OpenList(summary);
foreach (map value, http_ports,
{
- tmp = "";
- if (size(value["host"]:"") > 0) tmp = value["host"]:"" + ":";
- tmp = tmp + value["port"]:"";
+ tmp = "<i>";
+ if (size(value["host"]:"") > 0) tmp = tmp + value["host"]:"" + ":";
+ tmp = tmp + value["port"]:"" + (value["transparent"]:false ? _(" (transparent)") : "");
+ tmp = tmp + "</i>";
summary = Summary::AddListItem(summary, tmp);
});
summary = Summary::CloseList(summary);
}
+
+ //Cache directory
+ summary = Summary::AddLine(summary, _("Cache directory: ") + "<i>" + (settings["cache_dir"]:[])[1]:"" + "</i>");
}
return [ summary, [] ];
}
Modified: trunk/squid/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=40749&r1=40748&r2=40749&view=diff
==============================================================================
--- trunk/squid/src/complex.ycp (original)
+++ trunk/squid/src/complex.ycp Tue Sep 4 15:37:25 2007
@@ -198,6 +198,7 @@
`HSpacing(3),
`VBox(
"auto_start",
+ `VSpacing(),
(Mode::normal() ? "start_stop" : `Empty())
),
`HSpacing(3)
Modified: trunk/squid/src/squid.desktop
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/squid.desktop?rev=40749&r1=40748&r2=40749&view=diff
==============================================================================
--- trunk/squid/src/squid.desktop (original)
+++ trunk/squid/src/squid.desktop Tue Sep 4 15:37:25 2007
@@ -15,6 +15,7 @@
X-SuSE-YaST-Geometry=
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstResource=squid
+X-SuSE-YaST-AutoInstSchema=squid.rnc
Icon=yast-squid
Exec=/sbin/yast2 squid
Modified: trunk/squid/src/squid.rnc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/squid.rnc?rev=40749&r1=40748&r2=40749&view=diff
==============================================================================
--- trunk/squid/src/squid.rnc (original)
+++ trunk/squid/src/squid.rnc Tue Sep 4 15:37:25 2007
@@ -1,3 +1,15 @@
+default namespace = "http://www.suse.com/1.0/yast2ns"
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+namespace config = "http://www.suse.com/1.0/configns"
+
+
+# for testing:
+# call 'trang squid.rnc squid.rng' to generate .rng file
+# call '/usr/bin/xmllint --noout --relaxng /path/to/squid.rng /path/to/xml' to
+# verify correctness of .rnc
+#start = element profile { squid }
+#include '/usr/share/YaST2/schema/autoyast/rnc/common.rnc'
+
squid = element squid{
element acls{
LIST,
@@ -39,7 +51,6 @@
}*
}? &
element settings{
- LIST,
element access_log{
LIST,
element listentry{ text }*
@@ -76,7 +87,7 @@
LIST,
element listentry{ text }*
}? &
- element clien_lifetime{
+ element client_lifetime{
LIST,
element listentry{ text }*
}? &
Modified: trunk/squid/src/squid_auto.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/squid_auto.ycp?rev=40749&r1=40748&r2=40749&view=diff
==============================================================================
--- trunk/squid/src/squid_auto.ycp (original)
+++ trunk/squid/src/squid_auto.ycp Tue Sep 4 15:37:25 2007
@@ -77,6 +77,9 @@
/* Change configuration (run AutoSequence) */
else if (func == "Change") {
ret = SquidAutoSequence();
+ if (ret != `abort && ret != `cancel){
+ Squid::SetModified();
+ }
}
/* Import configuration */
else if (func == "Import") {
Modified: trunk/squid/yast2-squid.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/yast2-squid.spec.in?rev=40749&r1=40748&r2=40749&view=diff
==============================================================================
--- trunk/squid/yast2-squid.spec.in (original)
+++ trunk/squid/yast2-squid.spec.in Tue Sep 4 15:37:25 2007
@@ -29,5 +29,6 @@
@moduledir@/SquidACL.*
@moduledir@/SquidErrorMessages.*
@desktopdir@/squid.desktop
+@schemadir@/autoyast/rnc/squid.rnc
@scrconfdir@/*.scr
%doc @docdir@
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
dfiser＠svn.opensuse.org