java/code/webapp/WEB-INF/web.xml | 10 ++++++----
java/conf/rhn/rhn.conf | 1 +
web/conf/rhn_web.conf | 1 +
3 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 772b45f8d4b2f09e57d579ffbefba253b0fcdc24
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Tue Dec 7 09:22:35 2010 +0100
642988 - ISE when setting Software Channel Entitlements
diff --git a/java/code/webapp/WEB-INF/web.xml b/java/code/webapp/WEB-INF/web.xml
index 4e60f04..4c612fa 100644
--- a/java/code/webapp/WEB-INF/web.xml
+++ b/java/code/webapp/WEB-INF/web.xml
@@ -291,12 +291,14 @@
<resource-env-ref-type>javax.sql.DataSource</resource-env-ref-type>
</resource-env-ref>
-->
- <!-- configuration for HttpSession timeout, defaults to 30 minutes -->
- <!--
+ <!--
+ configuration for HttpSession timeout
+ please keep in sync with web.session_cookie_lifetime value
+ in rhn_web.conf and rhn.conf
+ -->
<session-config>
- <session-timeout>30</session-timeout>
+ <session-timeout>60</session-timeout>
</session-config>
- -->
<error-page>
<error-code>404</error-code>
diff --git a/java/conf/rhn/rhn.conf b/java/conf/rhn/rhn.conf
index e8a97ce..fbf8bba 100644
--- a/java/conf/rhn/rhn.conf
+++ b/java/conf/rhn/rhn.conf
@@ -21,6 +21,7 @@ web.db_tz_offset = -5
web.mount_point = /pub/
web.kickstart_mount_point = /pubqa/
+# keep this value in sync with session-timeout from web.xml
web.session_cookie_lifetime = +3600S
# pam_auth_service = login
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index 9019953..d277424 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -94,6 +94,7 @@ web.satellite_install = 0
web.session_cookie_lifetime =
# how long the session cookie lives in the database
+# 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
Show replies by date