java/code
by Jan Pazdziora
java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
New commits:
commit a34d9199bbb92d7fba3b13ac8c7413f87bc49825
Author: Johannes Renner <jrenner(a)suse.de>
Date: Thu Feb 17 11:20:52 2011 +0100
do not show delete link on creation of notes (bnc#672090)
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp
index 08b8a22..4a8836e 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp
@@ -9,18 +9,19 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
- <rhn:toolbar base="h2" img="/img/rhn-icon-note.gif"
- deletionUrl="/rhn/systems/details/DeleteNote.do?sid=${system.id}&nid=${n.id}"
- deletionType="note"
- >
- <bean:message key="sdc.details.notes.header"/>
- </rhn:toolbar>
-
<c:choose>
<c:when test="${empty param.nid}">
+ <rhn:toolbar base="h2" img="/img/rhn-icon-note.gif">
+ <bean:message key="sdc.details.notes.header"/>
+ </rhn:toolbar>
<c:set var="urlParam" scope="request" value="sid=${system.id}"/>
</c:when>
<c:otherwise>
+ <rhn:toolbar base="h2" img="/img/rhn-icon-note.gif"
+ deletionUrl="/rhn/systems/details/DeleteNote.do?sid=${system.id}&nid=${n.id}"
+ deletionType="note">
+ <bean:message key="sdc.details.notes.header"/>
+ </rhn:toolbar>
<c:set var="urlParam" scope="request" value="sid=${system.id}&nid=${n.id}"/>
</c:otherwise>
</c:choose>
13 years, 1 month
Changes to 'refs/tags/spacewalk-config-1.4.2-1'
by Miroslav Suchý
Tag 'spacewalk-config-1.4.2-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-03-01 08:11 +0000
Tagging package [spacewalk-config] version [1.4.2-1] in directory [spacewalk/config/].
Changes since rhn-client-tools-1.4.3-1:
Miroslav Suchý (1):
Automatic commit of package [spacewalk-config] release [1.4.2-1].
---
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/spacewalk-config.spec | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
---
13 years, 1 month
Changes to 'refs/tags/rhn-client-tools-1.4.3-1'
by Miroslav Suchý
Tag 'rhn-client-tools-1.4.3-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-03-01 08:10 +0000
Tagging package [rhn-client-tools] version [1.4.3-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-java-1.4.13-1:
Marcelo Moreira de Mello (2):
Added on rhn.conf man page a bunch of new options and fixed some typos.
Fixed some typos in man page for rhn.conf
Miroslav Suchý (2):
Revert "provide path to puplet-screenshot.png"
Automatic commit of package [rhn-client-tools] release [1.4.3-1].
---
client/rhel/rhn-client-tools/data/rh_register.glade | 2
client/rhel/rhn-client-tools/rhn-client-tools.spec | 13 +-
rel-eng/packages/rhn-client-tools | 2
spacewalk/config/usr/share/man/man5/rhn.conf.5 | 126 ++++++++++++++++----
4 files changed, 119 insertions(+), 24 deletions(-)
---
13 years, 1 month
rel-eng/packages spacewalk/config
by Miroslav Suchý
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/spacewalk-config.spec | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 05401def090bbc1cff216c8d4561e655189aa123
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Mar 1 09:11:23 2011 +0100
Automatic commit of package [spacewalk-config] release [1.4.2-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index ac11c2c..dee2827 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-1.4.1-1 spacewalk/config/
+1.4.2-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 8966162..3560aa8 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -1,6 +1,6 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 1.4.1
+Version: 1.4.2
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -96,6 +96,12 @@ fi
%changelog
+* Tue Mar 01 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.4.2-1
+- Fixed some typos in man page for rhn.conf (mmello(a)redhat.com)
+- Added on rhn.conf man page a bunch of new options and fixed some typos.
+ (mmello(a)redhat.com)
+- use better macro (msuchy(a)redhat.com)
+
* Mon Feb 28 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.4.1-1
- Modifing SPEC file including new man page
- Adding usr/share/man/man5/rhn.conf.5 manpage file (mmello(a)redhat.com)
13 years, 1 month
client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 13 ++++++++++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 31bae05cf1e4fdece2249db3996533216b047b11
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Mar 1 09:10:46 2011 +0100
Automatic commit of package [rhn-client-tools] release [1.4.3-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index f86398b..5078ce8 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.4.2
+Version: 1.4.3
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -292,6 +292,17 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Tue Mar 01 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.4.3-1
+- Revert "provide path to puplet-screenshot.png" (msuchy(a)redhat.com)
+- 666860 - remove glade warnings (msuchy(a)redhat.com)
+- provide path to puplet-screenshot.png (msuchy(a)redhat.com)
+- move <accessibility> in front of <signal> (msuchy(a)redhat.com)
+- 580479 - do not let combo box to fill available space (msuchy(a)redhat.com)
+- 651792 - if system is not registered, print nice error insted of TB
+ (msuchy(a)redhat.com)
+- 651857 - fix typo in variable name (msuchy(a)redhat.com)
+- 671039 - do not Traceback if system was never registered (msuchy(a)redhat.com)
+
* Wed Feb 16 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.4.2-1
- l10n: Updates to Russian (ru) translation (ypoyarko(a)fedoraproject.org)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 67a3832..26715d1 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.4.2-1 client/rhel/rhn-client-tools/
+1.4.3-1 client/rhel/rhn-client-tools/
13 years, 1 month
2 commits - spacewalk/config
by Miroslav Suchý
spacewalk/config/usr/share/man/man5/rhn.conf.5 | 126 ++++++++++++++++++++-----
1 file changed, 105 insertions(+), 21 deletions(-)
New commits:
commit d61f209e0c856b79e4afd5d8c44135ff1adba25c
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Tue Mar 1 04:46:37 2011 -0300
Fixed some typos in man page for rhn.conf
diff --git a/spacewalk/config/usr/share/man/man5/rhn.conf.5 b/spacewalk/config/usr/share/man/man5/rhn.conf.5
index 729749b..69021c0 100644
--- a/spacewalk/config/usr/share/man/man5/rhn.conf.5
+++ b/spacewalk/config/usr/share/man/man5/rhn.conf.5
@@ -176,7 +176,7 @@ account required /lib64/security/pam_ldap.so no_user_check
.fi
.IP \(bu 3
-restart Spacewalk/RHN Satellite service using
+restart Spacewalk/RHN Satellite service
.RE
.IP
.B Default:
@@ -333,5 +333,5 @@ Marcelo Moreira de Mello <mmello(a)redhat.com>
.SH "SEE ALSO"
.BR rhn.conf (5),
.BR rhn-activate-satellite (8),
-.BR db-control (1)
+.BR db-control (1),
.BR pam (8)
commit eadc53920cbe22385efc569feae85eb9d847efe5
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Tue Mar 1 04:33:05 2011 -0300
Added on rhn.conf man page a bunch of new options and fixed some typos.
diff --git a/spacewalk/config/usr/share/man/man5/rhn.conf.5 b/spacewalk/config/usr/share/man/man5/rhn.conf.5
index 1cd9950..729749b 100644
--- a/spacewalk/config/usr/share/man/man5/rhn.conf.5
+++ b/spacewalk/config/usr/share/man/man5/rhn.conf.5
@@ -8,20 +8,27 @@ rhn.conf \- Configuration file for Spacewalk/RHN Satellite Server
.B /etc/rhn/rhn.conf
.SH DESCRIPTION
.B rhn.conf
-is a configuration file for used for several services in Spacewalk/RHN Satellite server.
-The file content are read by
+is a configuration file used for several services in Spacewalk/RHN Satellite server.
+The file contents are read by the
.B rhn-satellite (8)
command to start the Spacewalk/RHN Satellite service.
.SH FORMAT
.P
-The format of /etc/rhn/rhn.conf is very simple. Each line is either a comment or a directive. Comment lines start with a # and are ignored. A directive line has the format below:
+Format of /etc/rhn/rhn.conf is very simple. Each line is either a comment or a directive. Comment lines start with a # and are ignored. A directive line has the format below:
.TP
parameter = value
.SH OPTIONS
+.P
+Spacewalk/RHN Satellite includes dozens other options in \fB/etc/rhn/default/*.conf\fR which administrator can override,
+but \fB*** JUST CHANGE THOSE PARAMETERS IF YOU REALLY KNOW WHAT ARE YOU DOING! *** \fR
+
+.P
+The most important tunables parameters in \fB/etc/rhn/rhn.conf\fR are listed below:
+
.TP
.B "traceback_mail"
Define which mail address will be used to notify about reports, warnings and Web traceback errors.
-Use comma to separate mail addresses.
+Use commas to separate mail addresses.
.IP
.B Default:
none
@@ -29,7 +36,7 @@ none
.TP
.B "mount_point"
Define the directory used to store the RPM package files offered by software channels.
-Per recommendation, we suggest at least 30 GB storage per software
+As a recommendation, we suggest at least 30 GB storage per software
channel (including Base and child channels).
.IP
.B Default:
@@ -44,15 +51,15 @@ Define the directory used to store the kickstart trees.
.TP
.B "repomd_cache_mount_point"
-Define the directory used to store the packages, errata, channels, kickstart-tree and repositories metadata
-cache information generated when using Spacewalk/RHN Satellite, which get regenerated, as needed, if deleted.
+Define the directory used to store the packages, errata, channels, kickstart trees and also store the repositories metadata
+cache information. It is generated when using Spacewalk/RHN Satellite on demand when the client asks for thoses files.
These cache files are stored in
.B /var/cache/rhn
and the storage needs of this directory will vary greatly. We suggest at least 10GB of space in
.B /var/cache/rhn
on Spacewalk/RHN Satellite server. Very large environments will need to increase the amount of space in
.B /var/cache/rhn
-directory.
+that directory.
.IP
.B Default:
@@ -60,7 +67,7 @@ directory.
.TP
.B "server.satellite.rhn_parent"
-This parameter determines the parent RHN/RHN Satellite which packages will be downloaded or synced. This parameter usually points to RHN Hosted,
+This parameter determines the parent RHN/RHN Satellite whose packages will be downloaded or synced. This parameter usually points to RHN Hosted,
.B rhn.redhat.com
.IP
.B Default:
@@ -68,7 +75,7 @@ none
.TP
.B "server.satellite.http_proxy"
-This parameter determines the HTTP proxy used to download or sync packages. Enter the IP address or HTTP Proxy FQDN address.
+This parameter determines the HTTP proxy used to download or sync packages from. Enter the IP address or HTTP Proxy FQDN address.
.IP
.B Default:
none
@@ -89,7 +96,7 @@ none
.TP
.B "server.satellite.ca_chain"
-This parameter specify the SSL certificate used in communication against
+This parameter specify the SSL certificate used for communicationg with
.B server.satellite.rhn_parent.
The default SSL CA certificate points to RHN Hosted.
.IP
@@ -101,7 +108,8 @@ The default SSL CA certificate points to RHN Hosted.
.P
.RS
This parameter determines debug level used by Spacewalk/RHN Satellite processes.
-Please, keep in mind that raising up this value will generate a very verbose logs, which is only useful for debug.
+Please, keep in mind that raising up this value will generate a very verbose logs, which is only useful for debugging
+purposes.
.B Use it carefully!
Valid values:
.B [0-6]
@@ -120,7 +128,7 @@ Valid values:
.TP
.B "disconnected (boolean)"
-This parameter controls if server is running in connected or disconnected mode.
+This parameter controls whether server is running in connected or disconnected mode.
When running in disconnected mode, the RHN Entitlement Certificate is activated locally
but not on remote RHN Servers. To switch to connected mode, see man page
.B rhn-satellite-activate (8).
@@ -129,12 +137,87 @@ but not on remote RHN Servers. To switch to connected mode, see man page
0
.TP
-.B "enable_snapshots"
-This parameter controls if server is allow system snapshots.
+.B "enable_snapshots" (boolean)
+This parameter controls whether server is allowed to perform system snapshots.
.IP
.B Default:
1
+.TP
+.B "pam_auth_service"
+Spacewalk/RHN Satellite supports network-based authentication systems via Pluggable Authentication Modules (PAM).
+Spacewalk/RHN Satellite supports LDAP, Kerberos, Directory Server and other network-based authentication
+systems. To enable Spacewalk/RHN Satellite to use PAM and your organization's authentication infrastructure, follow the
+steps below:
+.RS
+.IP \(bu 3
+make sure that pam\-devel package is installed
+.IP \(bu 3
+set the parameter \fBpam_auth_service = rhn\-satellite\fR
+.IP \(bu 3
+create a file in \fB/etc/pam.d/rhn\-satellite\fR which contains:
+
+.B For LDAP authentication on 32\-bit systems:
+.nf
+#%PAM-1.0
+auth required /lib/security/pam_env.so
+auth sufficient /lib/security/pam_ldap.so no_user_check
+auth required /lib/security/pam_deny.so
+account required /lib/security/pam_ldap.so no_user_check
+.fi
+
+.B For LDAP authentication on 64\-bit systems:
+.nf
+#%PAM-1.0
+auth required /lib64/security/pam_env.so
+auth sufficient /lib64/security/pam_ldap.so no_user_check
+auth required /lib64/security/pam_deny.so
+account required /lib64/security/pam_ldap.so no_user_check
+.fi
+
+.IP \(bu 3
+restart Spacewalk/RHN Satellite service using
+.RE
+.IP
+.B Default:
+none
+
+.TP
+.B "enable_nvrea" (boolean)
+This parameter controls whether server will allow package uploads for same NVREA
+(Name, Version, Release, Epoch, Arch) but different vendors.
+.RS
+.IP \(bu 3
+Spacewalk Server
+.RS
+.IP \(bu 3
+\fBDefault:\fR 1
+.RE
+.IP \(bu 3
+RHN Satellite Server
+.RS
+.IP \(bu 3
+\fBDefault:\fR 0
+.RE
+.RE
+
+.TP
+.B "web.is_monitoring_backend" (boolean)
+This parameter controls whether server will be able to monitor the registered systems.
+If you enable the Monitoring Backend, you should also enable Monitoring Scout, or configure the Monitoring Scout as a
+separate server.
+.IP
+.B Default:
+0
+
+.TP
+.B "web.is_monitoring_scout" (boolean)
+This parameter controls whether Monitoring Scout Agent will be running in that server.
+If you enable the Monitoring Scout, you must also enable the Monitoring Backend.
+.IP
+.B Default:
+0
+
.SS Database Options
.TP
.B "db_backend"
@@ -170,10 +253,10 @@ Determine the database port.
.IP
.SH Inter-RHN Satellite Sync (ISS)
-The ability of synchronization between two Spacewalk/RHN Satellites servers
+The ability of synchronize two Spacewalk/RHN Satellites servers
is called Inter-RHN Satellite Sync (ISS) which allows to synchronize channels
from the master RHN Satellite to slave servers, simplifying the
-process of coordinating content from one Spacewalk/RHN Satellite source to another or several others.
+process of coordinating contents from one Spacewalk/RHN Satellite source to another or several others.
.SS Master Spacewalk/RHN Satellite Servers
@@ -188,7 +271,7 @@ at this option.
.TP
.B "disable_iss"
If set to 1, then no slave will be able to sync from this server
-this option does not affect ability to sync to this server from
+this option does not affect the ability to sync to this server from
another spacewalk (or hosted).
.IP
.B Default:
@@ -206,11 +289,11 @@ Only use this option if this server is intended to be a slave server.
.TP
.B "iss_ca_chain"
-This parameter specify the SSL certificate used in communication against
+This parameter specifies the SSL certificate used when communication with
.B iss_parent
server. This certificate
.I must
-contains the
+contain the
.I SSL Common Name
from
.B iss_parent
@@ -251,3 +334,4 @@ Marcelo Moreira de Mello <mmello(a)redhat.com>
.BR rhn.conf (5),
.BR rhn-activate-satellite (8),
.BR db-control (1)
+.BR pam (8)
13 years, 1 month