Changes to 'refs/tags/spacewalk-web-1.8.35-1'
by Tomas Lestach
Tag 'spacewalk-web-1.8.35-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-09-07 08:30 +0000
Tagging package [spacewalk-web] version [1.8.35-1] in directory [web/].
Changes since spacewalk-java-1.8.142-1:
Tomas Lestach (2):
restore changelog
Automatic commit of package [spacewalk-web] release [1.8.35-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
---
11 years, 8 months
2 commits - rel-eng/packages web/spacewalk-web.spec
by Tomas Lestach
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 1f255fbdb057f02dc170a8fc2503832791fc97af
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 10:30:32 2012 +0200
Automatic commit of package [spacewalk-web] release [1.8.35-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 192483b..9459a2a 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.8.34-1 web/
+1.8.35-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 23fca41..dd3ba92 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.8.34
+Version: 1.8.35
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -253,6 +253,11 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Sep 07 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.35-1
+- restore changelog
+- changing web.chat_enabled -> java.chat_enabled
+- move java related configuration the rhn_java.conf
+
* Wed Sep 05 2012 Stephen Herr <sherr(a)redhat.com> 1.8.34-1
- 815964 - moving monitoring probe batch option from rhn.conf to rhn_web.conf
commit a0cf2edefaf471b5925c75e302018048a9a28f52
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 7 10:30:05 2012 +0200
restore changelog
modified in 3e87c3bf
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 34d2fe2..23fca41 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 java.chat_enabled to config file
+- add variable web.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
11 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.8.142-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.142-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-09-07 08:25 +0000
Tagging package [spacewalk-java] version [1.8.142-1] in directory [java/].
Changes since spacewalk-java-1.8.141-1:
Tomas Lestach (21):
move java related configuration the rhn_java.conf
deploy rhn_java.conf
changing web.min_user_len -> java.min_user_len
changing web.session_delete_batch_size -> java.session_delete_batch_size
changing web.session_delete_commit_interval -> java.session_delete_commit_interval
changing web.customer_service_email -> java.customer_service_email
changing web.development_environment -> java.development_environment
changing web.apiversion -> java.apiversion
changing web.sandbox_lifetime -> java.sandbox_lifetime
changing web.errata_cache_compute_threshold -> java.errata_cache_compute_threshold
changing web.l10n_debug_marker -> java.l10n_debug_marker
changing web.l10n_debug -> java.l10n_debug
changing web.l10n_missingmessage_exceptions -> java.l10n_missingmessage_exceptions
changing web.supported_locales -> java.supported_locales
changing web.excluded_countries -> java.excluded_countries
changing web.taskomatic_cobbler_user -> java.taskomatic_cobbler_user
changing web.chat_enabled -> java.chat_enabled
changing web.custom_header -> java.custom_header
changing web.custom_footer -> java.custom_footer
changing web.login_banner -> java.login_banner
Automatic commit of package [spacewalk-java] release [1.8.142-1].
---
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(-)
---
11 years, 8 months
21 commits - java/code java/conf java/spacewalk-java.spec rel-eng/packages web/conf web/spacewalk-web.spec
by Tomas Lestach
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 =
11 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.8.141-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.141-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-09-06 15:52 +0000
Tagging package [spacewalk-java] version [1.8.141-1] in directory [java/].
Changes since oracle-server-scripts-10.2.0.58-1:
Tomas Kasparek (2):
CryptoKeysHandlerTest are undertaken with OrgAdmin privileges.
Adding file path restoration functionality to spacewalk-data-fsck
Tomas Lestach (3):
removing java/buildconf/builder directory
removing unused IsoServlet
Automatic commit of package [spacewalk-java] release [1.8.141-1].
---
backend/satellite_tools/spacewalk-data-fsck | 53 +
dev/null |binary
java/buildconf/builder/config/satellite/default/rhn_hibernate.conf | 30
java/buildconf/builder/config/satellite/default/rhn_org_quartz.conf | 16
java/buildconf/builder/config/satellite/default/rhn_taskomatic.conf | 6
java/buildconf/builder/config/satellite/default/rhn_web.conf | 325 ----------
java/buildconf/builder/config/satellite/rhn.conf | 44 -
java/code/src/com/redhat/rhn/frontend/servlets/IsoServlet.java | 68 --
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/test/CryptoKeysHandlerTest.java | 14
java/spacewalk-java.spec | 9
rel-eng/packages/spacewalk-java | 2
11 files changed, 67 insertions(+), 500 deletions(-)
---
11 years, 8 months
3 commits - java/buildconf java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
dev/null |binary
java/buildconf/builder/config/satellite/default/rhn_hibernate.conf | 30
java/buildconf/builder/config/satellite/default/rhn_org_quartz.conf | 16
java/buildconf/builder/config/satellite/default/rhn_taskomatic.conf | 6
java/buildconf/builder/config/satellite/default/rhn_web.conf | 325 ----------
java/buildconf/builder/config/satellite/rhn.conf | 44 -
java/code/src/com/redhat/rhn/frontend/servlets/IsoServlet.java | 68 --
java/spacewalk-java.spec | 9
rel-eng/packages/spacewalk-java | 2
9 files changed, 9 insertions(+), 491 deletions(-)
New commits:
commit a0ba64524a9f6fee5c9b16be5eeba5fe599fe0c9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 6 17:52:09 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.141-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8e95812..74835b5 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.140
+Version: 1.8.141
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Sep 06 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.141-1
+- removing unused IsoServlet
+- removing java/buildconf/builder directory
+- CryptoKeysHandlerTest are undertaken with OrgAdmin privileges.
+- 815964 - not critical, but adding to this version of rhn_web.conf too
+- 815964 - moving monitoring probe batch option from rhn.conf to rhn_web.conf
+
* Tue Sep 04 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.140-1
- 853444 - list only subscribable base channels for actiovation key
associations
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a42cffa..2df2e6e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.140-1 java/
+1.8.141-1 java/
commit de446f44d549ce82b3e56f32ec04b4a9ad60c798
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 6 16:10:16 2012 +0200
removing unused IsoServlet
diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/IsoServlet.java b/java/code/src/com/redhat/rhn/frontend/servlets/IsoServlet.java
deleted file mode 100644
index 510d800..0000000
--- a/java/code/src/com/redhat/rhn/frontend/servlets/IsoServlet.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) 2009--2010 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public License,
- * version 2 (GPLv2). There is NO WARRANTY for this software, express or
- * implied, including the implied warranties of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
- * along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * Red Hat trademarks are not licensed under GPLv2. No permission is
- * granted to use or replicate Red Hat trademarks that are incorporated
- * in this software or its documentation.
- */
-package com.redhat.rhn.frontend.servlets;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Servlet which streams ISO files. Should be mapped to "*.iso"
- *
- * @version $Rev $
- */
-public class IsoServlet extends HttpServlet {
-
- private int chunkSize = -1;
-
- /**
- * {@inheritDoc}
- */
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- String configChunkSize = config.getInitParameter("chunk-size");
- if (configChunkSize != null) {
- try {
- chunkSize = Integer.parseInt(configChunkSize);
- }
- catch (NumberFormatException e) {
- chunkSize = 8192;
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- protected void doGet(HttpServletRequest request,
- HttpServletResponse response) throws ServletException, IOException {
- InputStream in = new FileInputStream("/test-iso" + request.getServletPath());
- byte[] chunk = new byte[this.chunkSize];
- int readsize = 0;
- response.setContentType("application/octet-stream");
- OutputStream out = response.getOutputStream();
- while ((readsize = in.read(chunk)) > 0) {
- out.write(chunk, 0, readsize);
- }
- response.flushBuffer();
- }
-}
commit 637c9136b25749613ed5108b7324f976214ea55e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 6 14:17:44 2012 +0200
removing java/buildconf/builder directory
diff --git a/java/buildconf/builder/config/satellite/default/rhn_hibernate.conf b/java/buildconf/builder/config/satellite/default/rhn_hibernate.conf
deleted file mode 100644
index f5ad273..0000000
--- a/java/buildconf/builder/config/satellite/default/rhn_hibernate.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-## HIBERNATE CONFIGURATION
-##
-## This is not the only way to configure hibernate. You can
-## create a hibernate.cfg.xml file or you can create your own
-## custom file which you parse and create a new Configuration object.
-##
-## We're using the hibernate.properties file because it's simple.
-############################################################################
-#hibernate.dialect=org.hibernate.dialect.Oracle9Dialect
-hibernate.dialect=org.hibernate.dialect.Oracle9Dialect
-hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver
-hibernate.connection.driver_proto=
-
-hibernate.use_outer_join=true
-hibernate.jdbc.batch_size=0
-#hibernate.show_sql=true
-
-hibernate.c3p0.min_size=5
-hibernate.c3p0.max_size=20
-hibernate.c3p0.timeout=300
-#
-# This should always be 0.
-#
-hibernate.c3p0.max_statements=0
-hibernate.c3p0.idle_test_period=300
-
-hibernate.cache.provider_class=org.hibernate.cache.OSCacheProvider
-hibernate.cache.use_query_cache=true
-hibernate.bytecode.use_reflection_optimizer=false
diff --git a/java/buildconf/builder/config/satellite/default/rhn_org_quartz.conf b/java/buildconf/builder/config/satellite/default/rhn_org_quartz.conf
deleted file mode 100644
index c0905aa..0000000
--- a/java/buildconf/builder/config/satellite/default/rhn_org_quartz.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# RHN configuration file for the Quartz Job scheduler
-
-#org.quartz.scheduler.instanceName = DefaultQuartzScheduler
-#org.quartz.scheduler.rmi.export = false
-#org.quartz.scheduler.rmi.proxy = false
-#org.quartz.scheduler.wrapJobExecutionInUserTransaction = false
-
-#org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
-#org.quartz.threadPool.threadCount = 10
-#org.quartz.threadPool.threadPriority = 5
-#org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread = true
-
-#org.quartz.jobStore.misfireThreshold = 60000
-
-#org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore
-
diff --git a/java/buildconf/builder/config/satellite/default/rhn_taskomatic.conf b/java/buildconf/builder/config/satellite/default/rhn_taskomatic.conf
deleted file mode 100644
index 65152a2..0000000
--- a/java/buildconf/builder/config/satellite/default/rhn_taskomatic.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-taskomatic.tasks = com.redhat.rhn.task.HelloWorldTask
-#, com.redhat.rhn.task.DailySummary
-# Use cron format for scheduling tasks
-taskomatic.com.redhat.rhn.task.HelloWorldTask.schedule = * * * * * ?
-# every 30 seconds
-taskomatic.com.redhat.rhn.task.DailSummary.schedule = 30 * * * * ?
diff --git a/java/buildconf/builder/config/satellite/default/rhn_web.conf b/java/buildconf/builder/config/satellite/default/rhn_web.conf
deleted file mode 100644
index c335883..0000000
--- a/java/buildconf/builder/config/satellite/default/rhn_web.conf
+++ /dev/null
@@ -1,325 +0,0 @@
-# comma separated list of Class::Name(s) that contain a
-# register_acl_handlers function, which will be called for every acl used
-# on this site
-web.base_acls = RHN::Access
-
-# this is the domain and port of the request, in terms of something
-# suitable for a Redirect or a Cookie domain. it is either the Host:
-# header of the incoming request, a hardcoded config value, or set by
-# the frontend mod_paf proxy via X-Server-Hostname.
-web.base_domain =
-web.base_port =
-
-# Limit the size of POST data (in bytes)
-web.post_max = 512000
-
-# host bounces should be set to
-web.bounce_to_host = mailer.webdev-colo.redhat.com
-
-# Location of external channel family licenses (ex. BEA JRockit, etc)
-web.channel_licenses_path =
-
-# offset for the database's timezone from utc
-web.db_tz_offset = 0
-
-# show PXT::Debug->log entries of this level and lower
-web.debug = 1
-
-# Default classes to instantiate when taskmaster runs (classes must be ISA
-# RHN::Task)
-web.default_taskmaster_tasks =
-
-# RHN::Mail never send email to these domains
-web.disallowed_mail_domains = localhost.localdomain, localhost
-
-# URL for the download server
-web.download_url =
-
-# URL for download kickstart data
-web.kickstart_host =
-
-# perform outgoing i18n; experimental
-web.enable_i18n = 0
-
-# Whether to enable OAI sync wrapper calls; mainline RHN only
-web.enable_oai_sync = 0
-
-# use crypt(3) for passwords in database
-web.encrypted_passwords = 0
-
-# Directory where RHN::Postal searches for formletters.
-web.formletter_dir = /var/www/html/formletters
-
-# Hour of the day, in EST24, that the throttling of freeloaders ends
-web.freeloader_throttle_end = 17
-
-# Hour of the day, in EST24, that the throttling of freeloaders begins
-web.freeloader_throttle_start = 9
-
-# keyring for GPG activity in httpd
-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/
-
-# package mount directory
-web.kickstart_mount_point = /pub/
-
-# Address all order confirmations are BCC'd too
-web.order_bcc_address =
-
-# Time in seconds to allow for a page render operation before showing a
-# warning.
-web.page_timing_threshold = 0
-
-# PAM service that controls authentication, or empty to disable PAM auth
-web.pam_auth_service =
-
-# comma separated list of Class::Name->method that
-# are called in sequence to validate formvars
-web.param_cleansers = RHN::Cleansers->cleanse
-
-# Verisign Payflow Pro certificate location
-web.pfpro_cert_path = /etc/httpd/conf/payflow-certs/
-
-# Verisign Payflow Pro fraud tolerance level
-web.pfpro_fraud_tolerance = 600
-
-# Verisign Payflow Pro partner
-web.pfpro_partner = VeriSign
-
-# Verisign Payflow Pro password
-web.pfpro_pwd = 123456
-
-# Verisign Payflow Pro server hostname
-web.pfpro_server = test-payflow.verisign.com
-
-# Verisign Payflow Pro transaction type
-web.pfpro_trxtype = A
-
-# Verisign Payflow Pro user name
-web.pfpro_user = redhat1
-
-# Verisign Payflow Pro vendor
-web.pfpro_vendor = redhat1
-
-# Turn on DBI::Profile profiling of queries
-web.profile_queries = 0
-
-# RHN::Mail will only send e-mail to addresses matching these domains if
-# set.
-web.restrict_mail_domains = redhat.com, pattern.net
-
-# Package to use for RHN::GPG backend
-web.rhn_gpg_backend_module = RHN::GPG::OpenPGP
-
-# system is running in satellite mode
-web.satellite = 0
-
-# how long the session cookie lives, in cookie-time
-web.session_cookie_lifetime =
-
-# how long the session cookie lives in the database
-web.session_database_lifetime = 3600
-
-# RHN::Session secret 1
-web.session_secret_1 =
-
-# RHN::Session secret 2
-web.session_secret_2 =
-
-# RHN::Session secret 3
-web.session_secret_3 =
-
-# RHN::Session secret 4
-web.session_secret_4 =
-
-# RHN::SessionSwap secret 1
-web.session_swap_secret_1 =
-
-# RHN::SessionSwap secret 2
-web.session_swap_secret_2 =
-
-# RHN::SessionSwap secret 3
-web.session_swap_secret_3 =
-
-# RHN::SessionSwap secret 4
-web.session_swap_secret_4 =
-
-# Is SSL available? ie, are we allowed to redirect ssl?
-web.ssl_available = 0
-
-# The number of days to wait to hear from a system before warning that it
-# is not checking it.
-web.system_checkin_threshold = 1
-
-# Time in seconds to allow for a tag render operation before showing a
-# warning.
-web.tag_timing_threshold = 0
-
-# the address where internal server error tracebacks should be sent
-web.traceback_mail =
-
-# enable or disable sessions
-web.use_sessions = 1
-
-# Whether to use Verisign's Payflow Pro system for credit card auth
-web.use_verisign = 0
-
-# Whether to enable PXT-code controllable caching for logged out content
-web.enable_caching = 1
-
-# Relative weights of possible download locations. choice is
-# probabalistic based on sum of weights. scale doesn't matter, but it
-# is easier to think of it when they all add up to 100
-web.download_local_weight = 100
-web.download_tpa_weight = 0
-web.download_akamai_weight = 0
-
-# lifetime of a URL generated by the download code, in seconds
-web.download_url_lifetime = 600
-
-# whether or not to turn SSL on when available for ISO and RPM downloads
-web.download_ssl_enable = 1
-
-# maximum package count for a tarball download
-web.download_tarball_max = 25
-
-# maximum number of times a token can be used
-web.download_token_limit = 5
-
-# default domainname for downloads
-web.download_local_domain =
-
-# crontab for the daily summary populator
-web.summary_populator_crontab = 0 4 * * *
-
-# number of seconds each cycle of the daily summary
-# reaper process will max out at for running through orgs...
-web.summary_reaper_batch_time = 30
-
-# crontab for the user deletion task
-web.user_deletion_crontab = 30 * * * *
-web.user_deletion_batch_time = 30
-
-# emails for the support tool stuff
-web.support_email = rhn-support(a)redhat.com
-web.customer_service_email =
-
-# requests for account deletion go here
-web.account_deletion_address = rhn-traffic(a)redhat.com
-
-# email address to send FAQ publication requests to
-web.faq_publication_email = rhn-traffic(a)redhat.com
-
-# email address to send education account creation info to
-web.education_account_email = rhn-traffic(a)redhat.com
-
-# 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 = webdev
-
-# default_db setting from python land, form of user/pass@tnsname
-web.default_db =
-
-# trace all sessions? (never enable in prod!)
-web.trace_session = 0
-
-# email address for feedback
-web.rhn_feedback_address = rhn-feedback(a)redhat.com
-
-# max number of sets of isos the "Latest ISOs" page should use
-web.max_latest_iso_categories = 3
-
-# download ISO channels to show on the easy download page; conf var
-# since itt changes with each release
-web.popular_iso_channels =
-
-web.config_delim_start = {|
-web.config_delim_end = |}
-
-# Bcc that RHN::Task::PushedUsers sends mails to
-web.pushed_users_bcc = rh-it-customers(a)redhat.com
-
-# the version of this RHN install as a whole
-web.version = 4.0.0
-
-# 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
-
-# default debug level for daemons. 0 == silence, 1 == info, 2 == debug, 3 == trace
-web.daemon_debug_level = 1
-
-# email address to send satellite emails from
-web.default_mail_from = Red Hat Network <dev-null(a)rhn.redhat.com>
-
-# should this system run the monitoring backend code?
-web.is_monitoring_backend = 0
-
-# should this system run the monitoring scout code?
-web.is_monitoring_scout = 0
-
-# how many monitoring probes to update at once. Large batches (eg. thousands)
-# can lead to database deadlocks.
-web.monitoring_probes_batch_size = 50
-
-# server configs needed for satellite installer
-server.satellite.rhn_parent =
-server.satellite.http_proxy =
-server.satellite.http_proxy_username =
-server.satellite.http_proxy_password =
-server.satellite.ca_chain =
-
-# temporary config var protecting the msg bus wakeup code in prod
-web.osa_tickle_enabled = 0
-
-# crontab for the entitlement poller.
-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
-# to put it in here.
-web.allow_pxt_personalities = 0
-
-# Configure the set of XML message files for the system
-# These packages indicate where the XML Resource bundles should
-# 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=$$$
-
-# 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,Lybia,Sudan,Syria
-web.excluded_countries=CU,IR,IQ,KP,LY,SD,SY
-
-web.taskomatic_cobbler_user = taskomatic_user
diff --git a/java/buildconf/builder/config/satellite/rhn.conf b/java/buildconf/builder/config/satellite/rhn.conf
deleted file mode 100644
index 7fb4bbe..0000000
--- a/java/buildconf/builder/config/satellite/rhn.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-
-# Required for Java code to understand personalities.
-web.allow_pxt_personalities = 1
-
-web.traceback_mail = jesusr@redhat.com,mmccune(a)redhat.com
-
-web.session_swap_secret_1 = 853e3324bfcf90a98f29396728dfd3e0
-web.session_swap_secret_2 = 8cb0a0505b474d99caae5f44e8068b47
-web.session_swap_secret_3 = 35475259596c0e1da6ea718a4eb3023d
-web.session_swap_secret_4 = b940aba9a00de60b854ef783cdf0f414
-
-web.session_secret_1 = 96cbc947c663121211337de27483a5713d0d0b
-web.session_secret_2 = 4add7d47d25378c950bc9be1212128a7bb33c9
-web.session_secret_3 = 0bddbf499dba0fa2c8adsfasdfadf115c9159c81658
-web.session_secret_4 = a983868cd63dadfvxbhfnh dg aerb5efbceec9da7811asdfaeb5c
-
-web.session_database_lifetime = 3600
-
-web.restrict_mail_domains=redhat.com, pattern.net
-
-# email address to send satellite emails from
-web.default_mail_from=Red Hat Network <dev-null(a)rhn.redhat.com>
-
-enable_oai_sync=1
-
-#Sat specific configs
-web.satellite = 1
-web.encrypted_passwords = 1
-web.is_monitoring_backend = 1
-
-db_user=rhnsat
-db_password=rhnsat
-db_name=//rlx-2-10.rhndev.redhat.com:1521/rhnsat.world
-
-do.orig.user.domain = 1
-web.default_db=rhnsat/rhnsat@rhnsat
-
-web.legacy_user_enabled = 1
-web.legacy_save_enabled = 1
-
-hibernate.connection.driver_proto=jdbc:log:oracle.jdbc.driver.OracleDriver:oracle:thin
-hibernate.connection.driver_class=net.rkbloom.logdriver.LogDriver
-
-web.product_name = Spacewalk
diff --git a/java/buildconf/builder/config/satellite/webapp-keyring.gpg b/java/buildconf/builder/config/satellite/webapp-keyring.gpg
deleted file mode 100644
index 33a38ef..0000000
Binary files a/java/buildconf/builder/config/satellite/webapp-keyring.gpg and /dev/null differ
11 years, 8 months
2 commits - backend/satellite_tools java/code
by Tomáš Kašpárek
backend/satellite_tools/spacewalk-data-fsck | 53 +++++++++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/test/CryptoKeysHandlerTest.java | 14 +-
2 files changed, 58 insertions(+), 9 deletions(-)
New commits:
commit 86bbb78dd505f53efd9435c29f6e581ca36d0625
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Sep 6 16:13:55 2012 +0200
Adding file path restoration functionality to spacewalk-data-fsck
If there is file path irregularity in file path and file info stored in the
database spacewalk-data-fsck reports NEVRAO mismatch. With new feature -F or
--fix-file-path spacewalk-data-fsck restores file path so it responds to informations
stored in the databse.
NEVRAO mismatches are mainly caused by upgrades from earlier versions of spacewalk,
where epochs were ommited in filepaths.
diff --git a/backend/satellite_tools/spacewalk-data-fsck b/backend/satellite_tools/spacewalk-data-fsck
index f16e48c..caab86d 100755
--- a/backend/satellite_tools/spacewalk-data-fsck
+++ b/backend/satellite_tools/spacewalk-data-fsck
@@ -28,6 +28,7 @@ report_msg = {
'file' : "%5d files scanned",
'exists' : "ERROR: %5d files missing on disk",
'dbexists' : "ERROR: %5d files missing in database",
+ 'restore' : "ERROR: %5d file paths could not be restored",
'size' : "ERROR: %5d file size mismatch(es)",
'checksum' : "ERROR: %5d file checksum mismatch(es)",
'nevrao' : "ERROR: %5d file NEVRAO mismatch(es)",
@@ -95,6 +96,8 @@ def check_db_vs_disk(options):
if check_disk_exists(abs_path) == 1:
report['exists'] += 1
+ elif options.restore:
+ report['restore'] += check_disk_nevrao(abs_path, row.copy(), True)
else:
if options.size:
report['size'] += check_disk_size(abs_path, row['package_size'])
@@ -105,7 +108,7 @@ def check_db_vs_disk(options):
row['checksum_type'], row['checksum'])
h.close()
error_found=0
- for i in ['file', 'exists', 'size', 'nevrao', 'checksum']:
+ for i in ['file', 'exists', 'restore', 'size', 'nevrao', 'checksum']:
if report[i] > 0:
log(1, report_msg[i] % report[i])
if i != 'file':
@@ -127,7 +130,7 @@ def check_disk_size(abs_path, size):
ret = 1
return ret
-def check_disk_nevrao(abs_path, row):
+def check_disk_nevrao(abs_path, row, restore=None):
file = {};
(_redhat_,
file['org_id'],
@@ -156,9 +159,53 @@ def check_disk_nevrao(abs_path, row):
if file[key] != row[key]:
log(0, "File path mismatch: %s (%s: %s vs. %s)" % (abs_path, key, row[key],
file[key]))
+ if restore:
+ log(2, "Begining file path restoration: %s" % abs_path)
+ return restore_file_path(file, row)
ret = 1
return ret
+
+def restore_file_path(file, row):
+ prefix = CFG.MOUNT_POINT + '/'
+ new_path = 'redhat/' + row['org_id'] + '/' + row['checksum_prefix'] + '/' + row['name'] + '/' + row['evr'] + '/' + row['arch'] + '/' + row['checksum'] + '/' + row['basename']
+ query = "update rhnPackage set path=\'" + new_path + "\' where id=" + str(row['id'])
+ new_path = prefix + new_path
+ cleanup = True
+ try: #1st, make dirs needed
+ os.makedirs(new_path.rsplit('/', 1)[0])
+ except OSError, e:
+ if e.errno!=17: #something broke up
+ log(0, "File path restoration failed: %s" % row['path'])
+ return 1
+ else:
+ cleanup = False #dir already exists, do not cleanup
+ try: #2nd, create hardlink; os.link and os.makedirs in 1 dir would be problem due to checking of errno 17...
+ os.link(prefix + row['path'], new_path)
+ except OSError:
+ log(0, "File path restoration failed, rolling back: %s" % row['path'])
+ if cleanup==True:
+ try:
+ os.removedirs(new_path.rsplit('/', 1)[0])
+ except OSError, e:
+ if e.errno!=39:
+ log(0, "Could not rollback file path restoration: %s" % row['path'])
+ return 1
+ return
+ h = rhnSQL.prepare(query)
+ h.execute()
+ rhnSQL.commit()
+ try:
+ os.remove(prefix + row['path'])
+ os.removedirs(prefix + row['path'].rsplit('/', 1)[0])
+ except OSError, e:
+ if e.errno==2:
+ log(2, "File %s%s was removed by someone else but transaction has been successfully completed" % (prefix, row['path']))
+ elif e.errno!=39:
+ log(4, "Unexpected error, computer is going to self destruct")
+ log(0, "File %s%s successfully restored, new file path: %s" % (prefix, row['path'], new_path))
+ return 0
+
def check_disk_checksum(abs_path, checksum_type, checksum):
try:
fp = file(abs_path ,'rb')
@@ -242,6 +289,8 @@ if __name__ == '__main__':
help="Check only if packages from filesystem are in the database"),
Option("-r", "--remove", action="store_true",
help="Automaticaly remove packages from filesystem not present in database"),
+ Option("-F", "--fix-file-path", action="store_true", dest="restore", default=False,
+ help="Restores file paths, try this when you have NEVRAO mismatches. Do not run this command with another commands"),
]
parser = OptionParser(option_list=options_table)
(options, args) = parser.parse_args()
commit 56e90002ce480b9de2b84bdca8713a32a2b000a0
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Sep 5 13:40:58 2012 +0200
CryptoKeysHandlerTest are undertaken with OrgAdmin privileges.
Change made in bugzilla 733420 prevented CryptoKeysHandlerTest run correctly as Org or Config admin is required for API calls in CryptoKeysHandler.
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/test/CryptoKeysHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/test/CryptoKeysHandlerTest.java
index b90ecc3..652006c 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/test/CryptoKeysHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/test/CryptoKeysHandlerTest.java
@@ -38,7 +38,7 @@ public class CryptoKeysHandlerTest extends BaseHandlerTestCase {
public void testListAllKeys() throws Exception {
// Setup
- User otherOrg = UserTestUtils.findNewUser();
+ User otherOrg = UserTestUtils.findNewUser("testUser", "testOrg", true);
CryptoKey key = CryptoTest.createTestKey(otherOrg.getOrg());
KickstartFactory.saveCryptoKey(key);
flushAndEvict(key);
@@ -65,11 +65,11 @@ public class CryptoKeysHandlerTest extends BaseHandlerTestCase {
// Test
CryptoKeysHandler handler = new CryptoKeysHandler();
- handler.create(regularKey, description, "GPG", content);
+ handler.create(adminKey, description, "GPG", content);
// Verify
CryptoKey cryptoKey =
- KickstartFactory.lookupCryptoKey(description, regular.getOrg());
+ KickstartFactory.lookupCryptoKey(description, admin.getOrg());
assertNotNull(cryptoKey);
assertEquals(cryptoKey.getDescription(), description);
@@ -79,14 +79,14 @@ public class CryptoKeysHandlerTest extends BaseHandlerTestCase {
public void testDelete() throws Exception {
// Setup
- CryptoKey key = CryptoTest.createTestKey(regular.getOrg());
+ CryptoKey key = CryptoTest.createTestKey(admin.getOrg());
KickstartFactory.saveCryptoKey(key);
assertNotNull(KickstartFactory.lookupCryptoKeyById(key.getId(), key.getOrg()));
flushAndEvict(key);
// Test
CryptoKeysHandler handler = new CryptoKeysHandler();
- handler.delete(regularKey, key.getDescription());
+ handler.delete(adminKey, key.getDescription());
// Verify
CryptoKey deletedKey =
@@ -96,14 +96,14 @@ public class CryptoKeysHandlerTest extends BaseHandlerTestCase {
public void testGetDetails() throws Exception {
// Setup
- CryptoKey key = CryptoTest.createTestKey(regular.getOrg());
+ CryptoKey key = CryptoTest.createTestKey(admin.getOrg());
KickstartFactory.saveCryptoKey(key);
assertNotNull(KickstartFactory.lookupCryptoKeyById(key.getId(), key.getOrg()));
flushAndEvict(key);
// Test
CryptoKeysHandler handler = new CryptoKeysHandler();
- CryptoKey cryptoKey = handler.getDetails(regularKey, key.getDescription());
+ CryptoKey cryptoKey = handler.getDetails(adminKey, key.getDescription());
// Verify
assertNotNull(cryptoKey);
11 years, 8 months
Changes to 'refs/tags/oracle-server-scripts-10.2.0.58-1'
by Michael Mraka
Tag 'oracle-server-scripts-10.2.0.58-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-09-06 09:08 +0000
Tagging package [oracle-server-scripts] version [10.2.0.58-1] in directory [projects/oracle-server-scripts/].
Changes since spacewalk-web-1.8.34-1:
Michael Mraka (3):
create 8GB data_tbs by default
852757 - create 2GB TEMP by default
Automatic commit of package [oracle-server-scripts] release [10.2.0.58-1].
Stephen Herr (1):
815964 - not critical, but adding to this version of rhn_web.conf too
---
java/buildconf/builder/config/satellite/default/rhn_web.conf | 4 ++
projects/oracle-server-scripts/embedded-createdb.tmpl | 20 +++++------
projects/oracle-server-scripts/oracle-server-scripts.spec | 6 ++-
rel-eng/packages/oracle-server-scripts | 2 -
4 files changed, 20 insertions(+), 12 deletions(-)
---
11 years, 8 months
3 commits - projects/oracle-server-scripts rel-eng/packages
by Michael Mraka
projects/oracle-server-scripts/embedded-createdb.tmpl | 20 +++++++-------
projects/oracle-server-scripts/oracle-server-scripts.spec | 6 +++-
rel-eng/packages/oracle-server-scripts | 2 -
3 files changed, 16 insertions(+), 12 deletions(-)
New commits:
commit ca30d3b068f957842f43b1aa4894d5933e8084f3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 6 11:08:07 2012 +0200
Automatic commit of package [oracle-server-scripts] release [10.2.0.58-1].
diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/projects/oracle-server-scripts/oracle-server-scripts.spec
index 8e1a70f..751b656 100644
--- a/projects/oracle-server-scripts/oracle-server-scripts.spec
+++ b/projects/oracle-server-scripts/oracle-server-scripts.spec
@@ -8,7 +8,7 @@
Summary: Oracle 10g Database Server Enterprise Edition scripts
Name: oracle-server-scripts
-Version: 10.2.0.57
+Version: 10.2.0.58
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
License: Proprietary
@@ -88,6 +88,10 @@ exit 0
%{oracle_scripts}
%changelog
+* Thu Sep 06 2012 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.58-1
+- 852757 - create 2GB TEMP by default
+- create 8GB data_tbs by default
+
* Mon Jul 16 2012 Jan Pazdziora 10.2.0.57-1
- Start using the .tar.gz in the .src.rpm for oracle-server-scripts.
diff --git a/rel-eng/packages/oracle-server-scripts b/rel-eng/packages/oracle-server-scripts
index 981ed59..e336c5e 100644
--- a/rel-eng/packages/oracle-server-scripts
+++ b/rel-eng/packages/oracle-server-scripts
@@ -1 +1 @@
-10.2.0.57-1 projects/oracle-server-scripts/
+10.2.0.58-1 projects/oracle-server-scripts/
commit d0fa4b8949cda9d2102f4de2ac0a6de6e4f0e95a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 6 11:06:20 2012 +0200
852757 - create 2GB TEMP by default
diff --git a/projects/oracle-server-scripts/embedded-createdb.tmpl b/projects/oracle-server-scripts/embedded-createdb.tmpl
index 8ebeb54..a06d75d 100644
--- a/projects/oracle-server-scripts/embedded-createdb.tmpl
+++ b/projects/oracle-server-scripts/embedded-createdb.tmpl
@@ -32,8 +32,8 @@ create database
'RHNORA_DATA_PATH()/undo_01.dbf' size RHNORA_SPACE(500)M reuse,
'RHNORA_DATA_PATH()/undo_02.dbf' size RHNORA_SPACE(500)M reuse
smallfile default temporary tablespace temp_tbs tempfile
- 'RHNORA_DATA_PATH()/temp_01.dbf' size RHNORA_SPACE(500)M reuse,
- 'RHNORA_DATA_PATH()/temp_02.dbf' size RHNORA_SPACE(500)M reuse
+ 'RHNORA_DATA_PATH()/temp_01.dbf' size RHNORA_SPACE(1000)M reuse,
+ 'RHNORA_DATA_PATH()/temp_02.dbf' size RHNORA_SPACE(1000)M reuse
logfile
group 10 (
'RHNORA_DATA_PATH()/redo_1001.log',
commit 193433fe5bdd3e5affe2f3ab15af8d9fb35b7ed9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 13 15:58:55 2012 +0200
create 8GB data_tbs by default
diff --git a/projects/oracle-server-scripts/embedded-createdb.tmpl b/projects/oracle-server-scripts/embedded-createdb.tmpl
index 945f449..8ebeb54 100644
--- a/projects/oracle-server-scripts/embedded-createdb.tmpl
+++ b/projects/oracle-server-scripts/embedded-createdb.tmpl
@@ -63,14 +63,14 @@ select sysdate, 'Creating tablespace data_tbs' message from dual;
create smallfile tablespace data_tbs
datafile
- 'RHNORA_DATA_PATH()/data_01.dbf' size RHNORA_SPACE(500)M,
- 'RHNORA_DATA_PATH()/data_02.dbf' size RHNORA_SPACE(500)M,
- 'RHNORA_DATA_PATH()/data_03.dbf' size RHNORA_SPACE(500)M,
- 'RHNORA_DATA_PATH()/data_04.dbf' size RHNORA_SPACE(500)M,
- 'RHNORA_DATA_PATH()/data_05.dbf' size RHNORA_SPACE(500)M,
- 'RHNORA_DATA_PATH()/data_06.dbf' size RHNORA_SPACE(500)M,
- 'RHNORA_DATA_PATH()/data_07.dbf' size RHNORA_SPACE(500)M,
- 'RHNORA_DATA_PATH()/data_08.dbf' size RHNORA_SPACE(500)M
+ 'RHNORA_DATA_PATH()/data_01.dbf' size RHNORA_SPACE(1000)M,
+ 'RHNORA_DATA_PATH()/data_02.dbf' size RHNORA_SPACE(1000)M,
+ 'RHNORA_DATA_PATH()/data_03.dbf' size RHNORA_SPACE(1000)M,
+ 'RHNORA_DATA_PATH()/data_04.dbf' size RHNORA_SPACE(1000)M,
+ 'RHNORA_DATA_PATH()/data_05.dbf' size RHNORA_SPACE(1000)M,
+ 'RHNORA_DATA_PATH()/data_06.dbf' size RHNORA_SPACE(1000)M,
+ 'RHNORA_DATA_PATH()/data_07.dbf' size RHNORA_SPACE(1000)M,
+ 'RHNORA_DATA_PATH()/data_08.dbf' size RHNORA_SPACE(1000)M
extent management local segment space management auto;
alter database default tablespace data_tbs;
11 years, 8 months
java/buildconf
by StephenHerr
java/buildconf/builder/config/satellite/default/rhn_web.conf | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 6da40f3e97b78d807546dca6b315e2c05b80ab04
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Sep 5 11:30:13 2012 -0400
815964 - not critical, but adding to this version of rhn_web.conf too
diff --git a/java/buildconf/builder/config/satellite/default/rhn_web.conf b/java/buildconf/builder/config/satellite/default/rhn_web.conf
index 20b287e..c335883 100644
--- a/java/buildconf/builder/config/satellite/default/rhn_web.conf
+++ b/java/buildconf/builder/config/satellite/default/rhn_web.conf
@@ -274,6 +274,10 @@ web.is_monitoring_backend = 0
# should this system run the monitoring scout code?
web.is_monitoring_scout = 0
+# how many monitoring probes to update at once. Large batches (eg. thousands)
+# can lead to database deadlocks.
+web.monitoring_probes_batch_size = 50
+
# server configs needed for satellite installer
server.satellite.rhn_parent =
server.satellite.http_proxy =
11 years, 8 months