java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
| 4
java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf
| 2
java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
| 12 +-
java/code/src/com/redhat/rhn/common/localization/test/LocalizationServiceTest.java
| 10 -
java/code/src/com/redhat/rhn/frontend/servlets/test/ResourceReloadServletTest.java
| 6 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
| 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/api/test/ApiHandlerTest.java
| 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/preferences/locale/test/PreferencesLocaleHandlerTest.java
| 2
java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java
| 2
java/code/src/com/redhat/rhn/taskomatic/task/SessionCleanup.java
| 4
java/code/src/com/redhat/rhn/testing/TestUtils.java
| 10 -
java/code/webapp/WEB-INF/includes/advertisements.jsp
| 2
java/code/webapp/WEB-INF/includes/footer.jsp
| 2
java/code/webapp/WEB-INF/includes/header.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
| 2
java/code/webapp/WEB-INF/pages/common/login.jsp
| 2
java/code/webapp/WEB-INF/pages/common/relogin.jsp
| 2
java/conf/rhn_java.conf
| 58 ++++++++++
java/spacewalk-java.spec
| 29 ++++-
rel-eng/packages/spacewalk-java
| 2
web/conf/rhn_web.conf
| 57 ---------
web/spacewalk-web.spec
| 2
22 files changed, 122 insertions(+), 94 deletions(-)
New commits:
commit 310eaadfcdb11913acd23f8313e79f88b29d1a40
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 10:25:02 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.142-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 57e414e..8afed7e 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.141
+Version: 1.8.142
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -616,6 +616,31 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Sep 07 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.142-1
+- changing web.login_banner -> java.login_banner
+- changing web.custom_footer -> java.custom_footer
+- changing web.custom_header -> java.custom_header
+- changing web.chat_enabled -> java.chat_enabled
+- changing web.taskomatic_cobbler_user -> java.taskomatic_cobbler_user
+- changing web.excluded_countries -> java.excluded_countries
+- changing web.supported_locales -> java.supported_locales
+- changing web.l10n_missingmessage_exceptions ->
+ java.l10n_missingmessage_exceptions
+- changing web.l10n_debug -> java.l10n_debug
+- changing web.l10n_debug_marker -> java.l10n_debug_marker
+- changing web.errata_cache_compute_threshold ->
+ java.errata_cache_compute_threshold
+- changing web.sandbox_lifetime -> java.sandbox_lifetime
+- changing web.apiversion -> java.apiversion
+- changing web.development_environment -> java.development_environment
+- changing web.customer_service_email -> java.customer_service_email
+- changing web.session_delete_commit_interval ->
+ java.session_delete_commit_interval
+- changing web.session_delete_batch_size -> java.session_delete_batch_size
+- changing web.min_user_len -> java.min_user_len
+- deploy rhn_java.conf
+- move java related configuration the rhn_java.conf
+
* Thu Sep 06 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.141-1
- removing unused IsoServlet
- removing java/buildconf/builder directory
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 2df2e6e..8ec9590 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.141-1 java/
+1.8.142-1 java/
commit 9b95e89015ba6a96458e24078b8659e9e67666c1
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:31:01 2012 +0200
changing web.login_banner -> java.login_banner
diff --git a/java/code/webapp/WEB-INF/pages/common/login.jsp
b/java/code/webapp/WEB-INF/pages/common/login.jsp
index 7a6c424..b274c1c 100644
--- a/java/code/webapp/WEB-INF/pages/common/login.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/login.jsp
@@ -33,7 +33,7 @@
</c:if>
<div id="contentRight">
- <c:set var="login_banner" scope="page"
value="${rhn:getConfig('web.login_banner')}" />
+ <c:set var="login_banner" scope="page"
value="${rhn:getConfig('java.login_banner')}" />
<c:choose>
<c:when test="${! empty login_banner}">
<p><c:out value="${login_banner}"
escapeXml="false"/></p>
diff --git a/java/code/webapp/WEB-INF/pages/common/relogin.jsp
b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
index e38243e..6cdbf77 100644
--- a/java/code/webapp/WEB-INF/pages/common/relogin.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
@@ -35,7 +35,7 @@
</div> <!-- end contentLeft -->
<div id="contentRight">
- <c:set var="login_banner" scope="page"
value="${rhn:getConfig('web.login_banner')}" />
+ <c:set var="login_banner" scope="page"
value="${rhn:getConfig('java.login_banner')}" />
<c:if test="${! empty login_banner}">
<p><c:out value="${login_banner}"
escapeXml="false"/></p>
</c:if>
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index 6dfa47c..e403067 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -55,4 +55,4 @@ java.custom_footer =
# text to be displayed on the login page
# (join long lines with \, HTML is okay to use)
-web.login_banner =
+java.login_banner =
commit 66e10262a370a52b9ae319ee32f66d22b0ff8b04
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:30:44 2012 +0200
changing web.custom_footer -> java.custom_footer
diff --git a/java/code/webapp/WEB-INF/includes/footer.jsp
b/java/code/webapp/WEB-INF/includes/footer.jsp
index a94a925..5d64d5f 100644
--- a/java/code/webapp/WEB-INF/includes/footer.jsp
+++ b/java/code/webapp/WEB-INF/includes/footer.jsp
@@ -9,7 +9,7 @@
: <a
href="http://www.redhat.com/">redhat.com</a>
<div style="color: black"><bean:message
key="footer.jsp.release" arg0="/rhn/help/dispatcher/release_notes"
arg1="${rhn:getConfig('web.version')}" /></div>
<p><%@ include
file="/WEB-INF/pages/common/fragments/bugzilla.jspf" %></p>
- <c:set var="custom_footer" scope="page"
value="${rhn:getConfig('web.custom_footer')}" />
+ <c:set var="custom_footer" scope="page"
value="${rhn:getConfig('java.custom_footer')}" />
<c:if test="${! empty custom_footer}">
<p><c:out value="${custom_footer}"
escapeXml="false"/></p>
</c:if>
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index 071952a..6dfa47c 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -51,7 +51,7 @@ java.chat_enabled = 0
java.custom_header =
# text to be displayed in the footer of every page
-web.custom_footer =
+java.custom_footer =
# text to be displayed on the login page
# (join long lines with \, HTML is okay to use)
commit e00d8e8a1f2dc7f3fc34d91d88f63feacc95f34c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:30:33 2012 +0200
changing web.custom_header -> java.custom_header
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp
b/java/code/webapp/WEB-INF/includes/header.jsp
index ef70d78..ace7d30 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -4,7 +4,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<!-- header.jsp -->
-<c:set var="custom_header" scope="page"
value="${rhn:getConfig('web.custom_header')}" />
+<c:set var="custom_header" scope="page"
value="${rhn:getConfig('java.custom_header')}" />
<c:if test="${! empty custom_header}">
<center><p><c:out value="${custom_header}"
escapeXml="false"/></p></center>
</c:if>
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index a940561..071952a 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -48,7 +48,7 @@ java.taskomatic_cobbler_user = taskomatic_user
java.chat_enabled = 0
# text to be displayed in the header of every page
-web.custom_header =
+java.custom_header =
# text to be displayed in the footer of every page
web.custom_footer =
commit 3e87c3bf2e2d1372f5bbb6979267f0d8e23fec66
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:30:18 2012 +0200
changing web.chat_enabled -> java.chat_enabled
diff --git a/java/code/webapp/WEB-INF/includes/advertisements.jsp
b/java/code/webapp/WEB-INF/includes/advertisements.jsp
index 63c337c..191d9e1 100644
--- a/java/code/webapp/WEB-INF/includes/advertisements.jsp
+++ b/java/code/webapp/WEB-INF/includes/advertisements.jsp
@@ -2,7 +2,7 @@
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<!-- TODO make this more generic -->
-<rhn:require acl="is(web.chat_enabled);">
+<rhn:require acl="is(java.chat_enabled);">
<jsp:include
page="/WEB-INF/includes/advertisements/chat-advertisement.jsp"/>
</rhn:require>
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index 399d837..a940561 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -45,7 +45,7 @@ java.excluded_countries=CU,IR,IQ,KP,SD,SY
java.taskomatic_cobbler_user = taskomatic_user
# allow users to chat with spacewalk members on IRC via the web
-web.chat_enabled = 0
+java.chat_enabled = 0
# text to be displayed in the header of every page
web.custom_header =
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 23fca41..34d2fe2 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -1235,7 +1235,7 @@ rm -rf $RPM_BUILD_ROOT
(tlestach(a)redhat.com)
* Mon Nov 30 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.7-1
-- add variable web.chat_enabled to config file
+- add variable java.chat_enabled to config file
* Thu Nov 19 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.6-1
- 531649 - fixed confirmation message after channel merge/compare
commit 36316d73bf5e9f780fad77a5dcd780d683144e57
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:30:06 2012 +0200
changing web.taskomatic_cobbler_user -> java.taskomatic_cobbler_user
diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
index f2971af..c22e707 100644
--- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
+++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
@@ -86,7 +86,7 @@ public class ConfigDefaults {
public static final String PRODUCT_NAME = "web.product_name";
- public static final String COBBLER_AUTOMATED_USER =
"web.taskomatic_cobbler_user";
+ public static final String COBBLER_AUTOMATED_USER =
"java.taskomatic_cobbler_user";
public static final String DOC_REFERENCE_GUIDE = "docs.reference_guide";
public static final String DOC_INSTALL_GUIDE = "docs.install_guide";
diff --git a/java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf
b/java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf
index 2d1a57c..5b3ac08 100644
--- a/java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf
+++ b/java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf
@@ -8,5 +8,5 @@ web.collision=10
web.property_with_comment = 42 #This shouldn't be part of the value
web.product_name=Spacewalk
-web.taskomatic_cobbler_user = taskomatic_user
+java.taskomatic_cobbler_user = taskomatic_user
web.monitoring_probes_batch_size = 50
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index 1c09830..399d837 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -42,7 +42,7 @@
java.supported_locales=bn_IN,de,en_US,es,fr,gu,hi,it,ja,ko,pa,pt_BR,ru,ta,zh_CN,
java.excluded_countries=CU,IR,IQ,KP,SD,SY
#this is the username taskomatic uses to log into cobber, and that is authenticated by
spacewalk
-web.taskomatic_cobbler_user = taskomatic_user
+java.taskomatic_cobbler_user = taskomatic_user
# allow users to chat with spacewalk members on IRC via the web
web.chat_enabled = 0
commit b707d0243b2b3cdfbf9333b66b7803cb0e1ce1bd
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:49:00 2012 +0200
changing web.excluded_countries -> java.excluded_countries
diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
index 7697139..f2971af 100644
--- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
+++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
@@ -76,7 +76,7 @@ public class ConfigDefaults {
public static final String CONFIG_REVISION_MAX_SIZE =
"web.maximum_config_file_size";
- public static final String WEB_EXCLUDED_COUNTRIES =
"web.excluded_countries";
+ public static final String WEB_EXCLUDED_COUNTRIES =
"java.excluded_countries";
public static final String DISCONNECTED = "disconnected";
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index 6a9695b..1c09830 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -39,7 +39,7 @@
java.supported_locales=bn_IN,de,en_US,es,fr,gu,hi,it,ja,ko,pa,pt_BR,ru,ta,zh_CN,
# List of countries to exclude for new user creation
# This is currently: Cuba,Iran,Iraq,North Korea,Sudan,Syria
-web.excluded_countries=CU,IR,IQ,KP,SD,SY
+java.excluded_countries=CU,IR,IQ,KP,SD,SY
#this is the username taskomatic uses to log into cobber, and that is authenticated by
spacewalk
web.taskomatic_cobbler_user = taskomatic_user
commit a2158262d8bac7d4b409b29a2523c196b8daa4d6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:29:46 2012 +0200
changing web.supported_locales -> java.supported_locales
diff --git a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
index d35bb0b..5f4bc9c 100644
--- a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
+++ b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
@@ -132,7 +132,7 @@ public class LocalizationService {
}
private void loadSupportedLocales() {
- String rawLocales = Config.get().getString("web.supported_locales");
+ String rawLocales = Config.get().getString("java.supported_locales");
if (rawLocales == null) {
return;
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/preferences/locale/test/PreferencesLocaleHandlerTest.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/preferences/locale/test/PreferencesLocaleHandlerTest.java
index 9479050..c3920e0 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/preferences/locale/test/PreferencesLocaleHandlerTest.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/preferences/locale/test/PreferencesLocaleHandlerTest.java
@@ -60,7 +60,7 @@ public class PreferencesLocaleHandlerTest extends BaseHandlerTestCase {
public void testListLocales() {
Object[] o = handler.listLocales();
assertNotNull(o);
- String[] locales =
Config.get().getStringArray("web.supported_locales");
+ String[] locales =
Config.get().getStringArray("java.supported_locales");
assertNotNull(locales);
assertEquals(locales.length, o.length);
}
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index 6132220..6a9695b 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -35,7 +35,7 @@ java.l10n_debug_marker=$$$
java.l10n_missingmessage_exceptions=false
# List of supported locales
-web.supported_locales=bn_IN,de,en_US,es,fr,gu,hi,it,ja,ko,pa,pt_BR,ru,ta,zh_CN,zh_TW
+java.supported_locales=bn_IN,de,en_US,es,fr,gu,hi,it,ja,ko,pa,pt_BR,ru,ta,zh_CN,zh_TW
# List of countries to exclude for new user creation
# This is currently: Cuba,Iran,Iraq,North Korea,Sudan,Syria
commit a570e3d5c62aba0f14345d27fbf64415bd85f3db
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:29:33 2012 +0200
changing web.l10n_missingmessage_exceptions -> java.l10n_missingmessage_exceptions
diff --git a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
index ebf79ba..d35bb0b 100644
--- a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
+++ b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
@@ -363,7 +363,7 @@ public class LocalizationService {
"] not found.***" + caller;
log.error(message);
boolean exceptionMode = Config.get().getBoolean(
- "web.l10n_missingmessage_exceptions");
+ "java.l10n_missingmessage_exceptions");
if (exceptionMode) {
throw new IllegalArgumentException(message);
}
diff --git
a/java/code/src/com/redhat/rhn/common/localization/test/LocalizationServiceTest.java
b/java/code/src/com/redhat/rhn/common/localization/test/LocalizationServiceTest.java
index b55965b..18fbed3 100644
--- a/java/code/src/com/redhat/rhn/common/localization/test/LocalizationServiceTest.java
+++ b/java/code/src/com/redhat/rhn/common/localization/test/LocalizationServiceTest.java
@@ -153,9 +153,9 @@ public class LocalizationServiceTest extends RhnBaseTestCase {
public void testGetInvalidMessage() {
assertFalse("Didn't fetch an invalid message (we want to, in this
test)",
isMessageValid(ls.getMessage("no message with this
key")));
- // web.l10n_missingmessage_exceptions
- boolean orig =
Config.get().getBoolean("web.l10n_missingmessage_exceptions");
- Config.get().setBoolean("web.l10n_missingmessage_exceptions",
"true");
+ // java.l10n_missingmessage_exceptions
+ boolean orig =
Config.get().getBoolean("java.l10n_missingmessage_exceptions");
+ Config.get().setBoolean("java.l10n_missingmessage_exceptions",
"true");
boolean caught = false;
try {
@@ -165,7 +165,7 @@ public class LocalizationServiceTest extends RhnBaseTestCase {
caught = true;
}
assertTrue(caught);
- Config.get().setBoolean("web.l10n_missingmessage_exceptions",
+ Config.get().setBoolean("java.l10n_missingmessage_exceptions",
Boolean.toString(orig));
}
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index 63af62a..6132220 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -32,7 +32,7 @@ java.errata_cache_compute_threshold = 30
# have been externalized with calls to fetch their translated resource.
java.l10n_debug=false
java.l10n_debug_marker=$$$
-web.l10n_missingmessage_exceptions=false
+java.l10n_missingmessage_exceptions=false
# List of supported locales
web.supported_locales=bn_IN,de,en_US,es,fr,gu,hi,it,ja,ko,pa,pt_BR,ru,ta,zh_CN,zh_TW
commit 712b05f777e3a92f40b893c028c4f479f1c35f67
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:29:13 2012 +0200
changing web.l10n_debug -> java.l10n_debug
diff --git a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
index f61e2c7..ebf79ba 100644
--- a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
+++ b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
@@ -314,7 +314,7 @@ public class LocalizationService {
private String getDebugVersionOfString(String mess) {
// If we have put the Service into debug mode we
// will wrap all the messages in a marker.
- boolean debugMode = Config.get().getBoolean("web.l10n_debug");
+ boolean debugMode = Config.get().getBoolean("java.l10n_debug");
if (debugMode) {
StringBuffer debug = new StringBuffer();
String marker = Config.get().getString("java.l10n_debug_marker",
diff --git a/java/code/src/com/redhat/rhn/testing/TestUtils.java
b/java/code/src/com/redhat/rhn/testing/TestUtils.java
index 8606887..cb625fa 100644
--- a/java/code/src/com/redhat/rhn/testing/TestUtils.java
+++ b/java/code/src/com/redhat/rhn/testing/TestUtils.java
@@ -356,14 +356,14 @@ public class TestUtils {
*
*/
public static void enableLocalizationDebugMode() {
- Config.get().setString("web.l10n_debug", "true");
+ Config.get().setString("java.l10n_debug", "true");
}
/**
* Turns of the Config setting for L10N debug mode
*/
public static void disableLocalizationDebugMode() {
- Config.get().setString("web.l10n_debug", "false");
+ Config.get().setString("java.l10n_debug", "false");
}
/**
@@ -392,9 +392,9 @@ public class TestUtils {
*/
public static boolean isLocalized(String checkMe) {
if (!Boolean.valueOf(
- Config.get().getString("web.l10n_debug",
"false")).booleanValue()) {
+ Config.get().getString("java.l10n_debug",
"false")).booleanValue()) {
throw new
- IllegalArgumentException("web.l10n_debug is set to false. " +
+ IllegalArgumentException("java.l10n_debug is set to false. "
+
"This test doesnt mean anything if its set to false.
");
}
return
(checkMe.startsWith(Config.get().getString("java.l10n_debug_marker",
"$$$")));
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index 93d4a8e..63af62a 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -30,7 +30,7 @@ java.errata_cache_compute_threshold = 30
# Puts the LocalizationService into debug mode so all the
# messages in the web UI will show up with a marker around them to indicate they
# have been externalized with calls to fetch their translated resource.
-web.l10n_debug=false
+java.l10n_debug=false
java.l10n_debug_marker=$$$
web.l10n_missingmessage_exceptions=false
commit b1e31e357902855a5609345dab9cc0ac8a9c1946
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:28:59 2012 +0200
changing web.l10n_debug_marker -> java.l10n_debug_marker
diff --git a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
index 3060d02..f61e2c7 100644
--- a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
+++ b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
@@ -317,7 +317,7 @@ public class LocalizationService {
boolean debugMode = Config.get().getBoolean("web.l10n_debug");
if (debugMode) {
StringBuffer debug = new StringBuffer();
- String marker = Config.get().getString("web.l10n_debug_marker",
+ String marker = Config.get().getString("java.l10n_debug_marker",
"$$$");
debug.append(marker);
debug.append(mess);
diff --git
a/java/code/src/com/redhat/rhn/common/localization/test/LocalizationServiceTest.java
b/java/code/src/com/redhat/rhn/common/localization/test/LocalizationServiceTest.java
index 5f44acc..b55965b 100644
--- a/java/code/src/com/redhat/rhn/common/localization/test/LocalizationServiceTest.java
+++ b/java/code/src/com/redhat/rhn/common/localization/test/LocalizationServiceTest.java
@@ -261,7 +261,7 @@ public class LocalizationServiceTest extends RhnBaseTestCase {
public void testDebugMessage() {
TestUtils.enableLocalizationDebugMode();
String received = ls.getMessage("testMessage");
- String marker = Config.get().getString("web.l10n_debug_marker",
"$$$");
+ String marker = Config.get().getString("java.l10n_debug_marker",
"$$$");
assertTrue(received.startsWith(marker));
assertTrue(received.endsWith(marker));
// Reset it back
diff --git a/java/code/src/com/redhat/rhn/testing/TestUtils.java
b/java/code/src/com/redhat/rhn/testing/TestUtils.java
index 5eec72a..8606887 100644
--- a/java/code/src/com/redhat/rhn/testing/TestUtils.java
+++ b/java/code/src/com/redhat/rhn/testing/TestUtils.java
@@ -397,7 +397,7 @@ public class TestUtils {
IllegalArgumentException("web.l10n_debug is set to false. " +
"This test doesnt mean anything if its set to false.
");
}
- return
(checkMe.startsWith(Config.get().getString("web.l10n_debug_marker",
"$$$")));
+ return
(checkMe.startsWith(Config.get().getString("java.l10n_debug_marker",
"$$$")));
}
/**
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index fc74a18..93d4a8e 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -31,7 +31,7 @@ java.errata_cache_compute_threshold = 30
# messages in the web UI will show up with a marker around them to indicate they
# have been externalized with calls to fetch their translated resource.
web.l10n_debug=false
-web.l10n_debug_marker=$$$
+java.l10n_debug_marker=$$$
web.l10n_missingmessage_exceptions=false
# List of supported locales
commit acce7c0671cbdf631a0400221f153589c20412ab
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:27:12 2012 +0200
changing web.errata_cache_compute_threshold -> java.errata_cache_compute_threshold
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index 1847c42..fc74a18 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -25,7 +25,7 @@ server.satellite.tiny_url_timeout = 4
# threshold for errata cache script vs website login computation.
# increase it to make for slower logins but faster EC runs, decrese it
# vice versa
-web.errata_cache_compute_threshold = 30
+java.errata_cache_compute_threshold = 30
# Puts the LocalizationService into debug mode so all the
# messages in the web UI will show up with a marker around them to indicate they
commit de288870614415a87f4c38ced13f790889ac9762
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:25:13 2012 +0200
changing web.sandbox_lifetime -> java.sandbox_lifetime
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index f77f885..1847c42 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -17,7 +17,7 @@ java.development_environment = 0
java.apiversion = 11.1
# lifetime for sandboxes, in days
-web.sandbox_lifetime = 3
+java.sandbox_lifetime = 3
# how long is KS file valid in hours
server.satellite.tiny_url_timeout = 4
commit c7345cd6f475d02f74aeaf4b1efd42ebc96dd5ec
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:24:56 2012 +0200
changing web.apiversion -> java.apiversion
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
index 9313640..74fa6a1 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
@@ -61,7 +61,7 @@ public class ApiHandler extends BaseHandler {
* @xmlrpc.returntype string
*/
public String getVersion() {
- return Config.get().getString("web.apiversion");
+ return Config.get().getString("java.apiversion");
}
private Collection getNamespaces() {
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/test/ApiHandlerTest.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/test/ApiHandlerTest.java
index 2772973..2e886c6 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/test/ApiHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/test/ApiHandlerTest.java
@@ -33,7 +33,7 @@ public class ApiHandlerTest extends RhnBaseTestCase {
public void testGetVersion() {
ApiHandler handler = new ApiHandler();
- String version = Config.get().getString("web.apiversion");
+ String version = Config.get().getString("java.apiversion");
assertEquals(version, handler.getVersion());
}
}
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index 2a50b67..f77f885 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -14,7 +14,7 @@ java.customer_service_email =
java.development_environment = 0
# the version of API
-web.apiversion = 11.1
+java.apiversion = 11.1
# lifetime for sandboxes, in days
web.sandbox_lifetime = 3
commit 9afd795171ebd9b8c304a9686e3c3f1ab1850f97
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:24:28 2012 +0200
changing web.development_environment -> java.development_environment
diff --git a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
index ecae4f2..3060d02 100644
--- a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
+++ b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
@@ -170,12 +170,12 @@ public class LocalizationService {
* @return boolean if we reloaded the files or not.
*/
public boolean reloadResourceFiles() {
- if (Config.get().getBoolean("web.development_environment")) {
+ if (Config.get().getBoolean("java.development_environment")) {
initService();
return true;
}
log.error("Tried to reload XML StringResource files but " +
- "we aren't in web.development_environment mode");
+ "we aren't in java.development_environment mode");
return false;
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/servlets/test/ResourceReloadServletTest.java
b/java/code/src/com/redhat/rhn/frontend/servlets/test/ResourceReloadServletTest.java
index 8c705aa..c3daa5c 100644
--- a/java/code/src/com/redhat/rhn/frontend/servlets/test/ResourceReloadServletTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/servlets/test/ResourceReloadServletTest.java
@@ -60,12 +60,12 @@ public class ResourceReloadServletTest extends MockObjectTestCase {
public void testDoGet() throws Exception {
ResourceReloadServlet servlet = new ResourceReloadServlet();
- boolean orig = Config.get().getBoolean("web.development_environment");
- Config.get().setBoolean("web.development_environment",
"true");
+ boolean orig =
Config.get().getBoolean("java.development_environment");
+ Config.get().setBoolean("java.development_environment",
"true");
servlet.doGet(request, response);
MockServletOutputStream ms = (MockServletOutputStream) output;
assertEquals("Reloaded resource files: [true]", ms.getContents());
- Config.get().setBoolean("web.development_environment",
+ Config.get().setBoolean("java.development_environment",
new Boolean(orig).toString());
}
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index de7499f..2a50b67 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -11,7 +11,7 @@ java.session_delete_commit_interval = 100
java.customer_service_email =
# is this system in a development environment?
-web.development_environment = 0
+java.development_environment = 0
# the version of API
web.apiversion = 11.1
commit 747d119eb764914d48416b69d6b9751a46d357b7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:24:06 2012 +0200
changing web.customer_service_email -> java.customer_service_email
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java
b/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java
index db58b77..b713480 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java
@@ -80,7 +80,7 @@ public class SatelliteCertificateCheck extends RhnJavaJob {
mail.setBody(body);
mail.setRecipients(TaskHelper.getAdminEmails(org));
- String from = Config.get().getString("web.customer_service_email",
+ String from = Config.get().getString("java.customer_service_email",
"dev-null(a)redhat.com");
mail.setFrom(from);
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index 26934fa..de7499f 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -8,7 +8,7 @@ java.session_delete_batch_size = 50000
java.session_delete_commit_interval = 100
# emails for the support tool stuff
-web.customer_service_email =
+java.customer_service_email =
# is this system in a development environment?
web.development_environment = 0
commit 5aa93f07cdeeb60dcb04f5c807bd1bf9c3cedd18
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:48:45 2012 +0200
changing web.session_delete_commit_interval -> java.session_delete_commit_interval
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/SessionCleanup.java
b/java/code/src/com/redhat/rhn/taskomatic/task/SessionCleanup.java
index 66d072e..c2da0b8 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/SessionCleanup.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/SessionCleanup.java
@@ -45,7 +45,7 @@ public class SessionCleanup extends RhnJavaJob {
//retrieves info from user preferences
long window = c.getInt("web.session_database_lifetime");
int batchSize = c.getInt("java.session_delete_batch_size");
- int commitInterval = c.getInt("web.session_delete_commit_interval");
+ int commitInterval = c.getInt("java.session_delete_commit_interval");
// 100000 is an arbitrary value
if (batchSize > 100000 || batchSize <= 0) {
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index efe0ba7..26934fa 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -5,7 +5,7 @@ java.min_user_len = 5
java.session_delete_batch_size = 50000
# how often to commit when deleting stale sessions
-web.session_delete_commit_interval = 100
+java.session_delete_commit_interval = 100
# emails for the support tool stuff
web.customer_service_email =
commit 564a3c3524a646547dd7c3daace00ad6ee042799
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:48:32 2012 +0200
changing web.session_delete_batch_size -> java.session_delete_batch_size
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/SessionCleanup.java
b/java/code/src/com/redhat/rhn/taskomatic/task/SessionCleanup.java
index b44b8df..66d072e 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/SessionCleanup.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/SessionCleanup.java
@@ -44,7 +44,7 @@ public class SessionCleanup extends RhnJavaJob {
//retrieves info from user preferences
long window = c.getInt("web.session_database_lifetime");
- int batchSize = c.getInt("web.session_delete_batch_size");
+ int batchSize = c.getInt("java.session_delete_batch_size");
int commitInterval = c.getInt("web.session_delete_commit_interval");
// 100000 is an arbitrary value
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index 893af26..efe0ba7 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -2,7 +2,7 @@
java.min_user_len = 5
# how many stale sessions will be deleted each time by taskomatic
-web.session_delete_batch_size = 50000
+java.session_delete_batch_size = 50000
# how often to commit when deleting stale sessions
web.session_delete_commit_interval = 100
commit 183358d224a1f36e891da6167a06bc9214d4ad54
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 09:48:23 2012 +0200
changing web.min_user_len -> java.min_user_len
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
index e92bf1d..a9bebae 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
@@ -37,7 +37,7 @@
<html:text property="login" size="15"
maxlength="45" styleId="login" />
<br>
<span class="small-text"><strong><bean:message
key="tip" /></strong>
- <bean:message key="org.login.tip"
arg0="${rhn:getConfig('web.min_user_len')}" /><br>"
+ <bean:message key="org.login.tip"
arg0="${rhn:getConfig('java.min_user_len')}" /><br>"
<bean:message key="org.login.examples" /></span>
</td>
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
index 48fb7aa..893af26 100644
--- a/java/conf/rhn_java.conf
+++ b/java/conf/rhn_java.conf
@@ -1,5 +1,5 @@
# Minimum username length
-web.min_user_len = 5
+java.min_user_len = 5
# how many stale sessions will be deleted each time by taskomatic
web.session_delete_batch_size = 50000
commit 5dc2d7f24fc1df75e6199dbf3d80ea9b33e7613f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 6 14:30:07 2012 +0200
deploy rhn_java.conf
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 74835b5..57e414e 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -395,6 +395,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -m 644 conf/default/rhn_hibernate.conf
$RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_hibernate.conf
install -m 644 conf/default/rhn_taskomatic_daemon.conf
$RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_taskomatic_daemon.conf
install -m 644 conf/default/rhn_org_quartz.conf
$RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_org_quartz.conf
+install -m 644 conf/rhn_java.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults
install -m 755 conf/logrotate/rhn_web_api
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rhn_web_api
install -m 755 scripts/taskomatic $RPM_BUILD_ROOT%{_initrddir}
install -m 755 scripts/unittest.xml $RPM_BUILD_ROOT/%{_datadir}/rhn/
@@ -599,6 +600,7 @@ fi
%{_prefix}/share/rhn/config-defaults/rhn_hibernate.conf
%{_prefix}/share/rhn/config-defaults/rhn_taskomatic_daemon.conf
%{_prefix}/share/rhn/config-defaults/rhn_org_quartz.conf
+%{_prefix}/share/rhn/config-defaults/rhn_java.conf
%config %{_sysconfdir}/logrotate.d/rhn_web_api
%files lib
commit 608f181a0f47616bde5c865ab18cd253b8233e4e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 25 16:34:50 2012 +0200
move java related configuration the rhn_java.conf
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
new file mode 100644
index 0000000..48fb7aa
--- /dev/null
+++ b/java/conf/rhn_java.conf
@@ -0,0 +1,58 @@
+# Minimum username length
+web.min_user_len = 5
+
+# how many stale sessions will be deleted each time by taskomatic
+web.session_delete_batch_size = 50000
+
+# how often to commit when deleting stale sessions
+web.session_delete_commit_interval = 100
+
+# emails for the support tool stuff
+web.customer_service_email =
+
+# is this system in a development environment?
+web.development_environment = 0
+
+# the version of API
+web.apiversion = 11.1
+
+# lifetime for sandboxes, in days
+web.sandbox_lifetime = 3
+
+# how long is KS file valid in hours
+server.satellite.tiny_url_timeout = 4
+
+# threshold for errata cache script vs website login computation.
+# increase it to make for slower logins but faster EC runs, decrese it
+# vice versa
+web.errata_cache_compute_threshold = 30
+
+# Puts the LocalizationService into debug mode so all the
+# messages in the web UI will show up with a marker around them to indicate they
+# have been externalized with calls to fetch their translated resource.
+web.l10n_debug=false
+web.l10n_debug_marker=$$$
+web.l10n_missingmessage_exceptions=false
+
+# List of supported locales
+web.supported_locales=bn_IN,de,en_US,es,fr,gu,hi,it,ja,ko,pa,pt_BR,ru,ta,zh_CN,zh_TW
+
+# List of countries to exclude for new user creation
+# This is currently: Cuba,Iran,Iraq,North Korea,Sudan,Syria
+web.excluded_countries=CU,IR,IQ,KP,SD,SY
+
+#this is the username taskomatic uses to log into cobber, and that is authenticated by
spacewalk
+web.taskomatic_cobbler_user = taskomatic_user
+
+# allow users to chat with spacewalk members on IRC via the web
+web.chat_enabled = 0
+
+# text to be displayed in the header of every page
+web.custom_header =
+
+# text to be displayed in the footer of every page
+web.custom_footer =
+
+# text to be displayed on the login page
+# (join long lines with \, HTML is okay to use)
+web.login_banner =
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index 3a3dcbd..4452325 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -54,9 +54,6 @@ web.gpg_keyring = /etc/webapp-keyring.gpg
# Maximum username length
web.max_user_len = 63
-# Minimum username length
-web.min_user_len = 5
-
# package mount directory
web.mount_point = /pub/
@@ -94,12 +91,6 @@ web.session_cookie_lifetime =
# keep this value in sync with session-timeout from web.xml
web.session_database_lifetime = 3600
-# how many stale sessions will be deleted each time by taskomatic
-web.session_delete_batch_size = 50000
-
-# how often to commit when deleting stale sessions
-web.session_delete_commit_interval = 100
-
# RHN::Session secret 1
web.session_secret_1 =
@@ -179,15 +170,10 @@ web.user_deletion_batch_time = 30
# emails for the support tool stuff
web.support_email =
-web.customer_service_email =
# requests for account deletion go here
web.account_deletion_address =
-
-# is this system in a development environment?
-web.development_environment = 0
-
# default DSN in /etc/pxtdb.conf to connect to for PXT itself
web.pxt_database_dsn =
@@ -218,15 +204,9 @@ web.config_delim_end = |}
# the version of this RHN install as a whole
web.version = 1.8 nightly
-# the version of API
-web.apiversion = 11.1
-
# maximum size for a config file
web.maximum_config_file_size = 131072
-# lifetime for sandboxes, in days
-web.sandbox_lifetime = 3
-
# facility rhn web daemons (primarily taskomatic) should use for
# logging valid values: local0, local1, local2, ..., local7
web.daemon_logging_facility = local7
@@ -254,9 +234,6 @@ server.satellite.http_proxy_username =
server.satellite.http_proxy_password =
server.satellite.ca_chain =
-# how long is KS file valid in hours
-server.satellite.tiny_url_timeout = 4
-
# temporary config var protecting the msg bus wakeup code in prod
web.osa_tickle_enabled = 0
@@ -265,11 +242,6 @@ web.ep_crontab = 30 * * * *
web.ep_poll_duration = 30 # end after 30 seconds
web.ep_commit_interval = 50 # do a commit at least every 50 orgs processed.
-# threshold for errata cache script vs website login computation.
-# increase it to make for slower logins but faster EC runs, decrese it
-# vice versa
-web.errata_cache_compute_threshold = 30
-
# Need a mechanism to know if we need to prefix the
# pxt-session-cookies with the hostname. In the perl/world this
# is a PerlSetVar in httpd.conf, but in the Java world we need
@@ -281,34 +253,17 @@ web.allow_pxt_personalities = 0
# be located relative to the java class structure.
web.l10n_resourcebundles=com.redhat.rhn.frontend.strings.jsp.StringPackage,com.redhat.rhn.frontend.strings.java.StringPackage,com.redhat.rhn.frontend.strings.database.StringPackage,com.redhat.rhn.frontend.strings.nav.StringPackage,com.redhat.rhn.frontend.strings.template.StringPackage
-# Puts the LocalizationService into debug mode so all the
-# messages in the web UI will show up with a marker around them to indicate they
-# have been externalized with calls to fetch their translated resource.
-web.l10n_debug=false
-web.l10n_debug_marker=$$$
-web.l10n_missingmessage_exceptions=false
-
server.nls_lang = English.UTF8
# Enable Solaris support
web.enable_solaris_support = 0
-# List of supported locales
-web.supported_locales=bn_IN,de,en_US,es,fr,gu,hi,it,ja,ko,pa,pt_BR,ru,ta,zh_CN,zh_TW
-
-# List of countries to exclude for new user creation
-# This is currently: Cuba,Iran,Iraq,North Korea,Sudan,Syria
-web.excluded_countries=CU,IR,IQ,KP,SD,SY
-
# List of urls that allow html characters in text input. We strip other urls.
web.unprotected_urls=/configuration/file/FileDetails,/configuration/ChannelUploadFiles,/configuration/ChannelCreateFiles,/systems/details/configuration/addfiles/CreateFile,/systems/details/configuration/addfiles/UploadFile
#The product name
web.product_name = Spacewalk
-#this is the username taskomatic uses to log into cobber, and that is authenticated by
spacewalk
-web.taskomatic_cobbler_user = taskomatic_user
-
# subscribe to proxy channel during proxy activation
# in spacewalk proxy has no separate channel, therefore disabled by default
web.subscribe_proxy_channel = 0
@@ -318,15 +273,3 @@ web.subscribe_proxy_channel = 0
# and can be used forever. (i.e. kernel,kernel-smp,kernel-xen)
web.non_expirable_package_urls =
-# allow users to chat with spacewalk members on IRC via the web
-web.chat_enabled = 0
-
-# text to be displayed in the header of every page
-web.custom_header =
-
-# text to be displayed in the footer of every page
-web.custom_footer =
-
-# text to be displayed on the login page
-# (join long lines with \, HTML is okay to use)
-web.login_banner =