[Fedora-directory-commits] adminserver/admserv/cfgstuff admserv.conf.in, 1.9, 1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14223/adminserver/admserv/cfgstuff
Modified Files:
admserv.conf.in
Log Message:
Resolves: bug 407011
Bug Description: GIF missing on the front page for admin web ui
Reviewed by: nhosoi (Thanks!)
Fix Description: Yet another carry over from the days when everything was under the single server root. We should not use relative paths for the icons, but just use "/icons/" for the path, and let Apache map that to the real location of the icon files.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: admserv.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- admserv.conf.in 27 Sep 2007 16:54:30 -0000 1.9
+++ admserv.conf.in 7 Dec 2007 17:43:50 -0000 1.10
@@ -67,6 +67,7 @@
# remap admin server icons
Alias /admin-serv/tasks/icons/ @icondir@/
+Alias /icons/ @icondir@/
# Handle the initial login
<Location /admin-serv/authenticate>
16 years, 4 months
[Fedora-directory-commits] console/src/com/netscape/management/client/topology topology.properties, 1.4, 1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/console/src/com/netscape/management/client/topology
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1809
Modified Files:
topology.properties
Log Message:
Resolves: bug 214977
Description: Small typo in console
Index: topology.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/topology.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- topology.properties 15 Nov 2007 16:56:53 -0000 1.4
+++ topology.properties 7 Dec 2007 16:41:54 -0000 1.5
@@ -167,7 +167,7 @@
error-ClassLoaderTitle=Class Loader Error
error-CreateServerObject=Failed to instantiate Server Object for {0}:
error-CannotChangePermission=Cannot change permission.
-error-EntryExisted=Entry already existed.
+error-EntryExisted=Entry already exists.
error-CannotCreateServerObject=Initialize server object error. Could not initialize object:
error-CannotCreateServerObjectTitle=Loading Server Object Error
error-CloneError=There are no target servers to clone to.
16 years, 4 months
[Fedora-directory-commits] admservconsole/help/en/help list_crl_ckl.html, NONE, 1.1 create_user_administrator_posix_user.html, 1.1, 1.2 search_users_and_groups_advanced.html, 1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/admservconsole/help/en/help
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8577/help
Modified Files:
create_user_administrator_posix_user.html
search_users_and_groups_advanced.html
Added Files:
list_crl_ckl.html
Log Message:
Resolves: #159011
Summary: online help for details of CRL missing (Comment #6,7)
Description: adding a missing map for the token CertificateDetailDialog_CRL:
CertificateDetailDialog_CRL-help = help/list_crl_ckl.html
And piggybacking to fix replication-monitor token.
--- NEW FILE list_crl_ckl.html ---
<p class="topic">
Certificate Information - Detail
</p>
<p class="text">
<b>General</b>
</p>
<ul>
<p class="text">
This panel lists detailed information about the selected certificate.
</p>
<p class="text">
<b>Issuer.</b> Lists the CA who issued each CRL or CKL.
</p>
<p class="text">
<b>Signature algorithm.</b> The mathematical formula used to sign the certificate.
</p>
<p class="text">
<b>Version.</b> The version number of the public key algorithm.
</p>
<p class="text">
<b>Issuer DN.</b> The full DN of the Certificate Authority (CA).
</p>
<p class="text">
<b>Effective Date.</b> Lists the date on which the CRL or CKL was issued.
</p>
<p class="text">
<b>Next Update.</b> Shows when an updated CRL or CKL will be available.
</p>
</ul>
<p class="text">
<b>Revocation List</b>
</p>
<ul>
<p class="text">
This panel lists serial numbers and dates revoked by the CA.
</p>
</ul>
Index: create_user_administrator_posix_user.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/create_user_administrator_posix_user.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- create_user_administrator_posix_user.html 9 Aug 2007 16:04:04 -0000 1.1
+++ create_user_administrator_posix_user.html 7 Dec 2007 01:27:47 -0000 1.2
@@ -9,13 +9,13 @@
<b>Enable Posix user attributes.</b> Check this box to enable the fields in this panel.
</p>
<p class="text">
-<b>UID Number. </b>(Optional) Enter the user or administrator's UNIX ID number.
+<b>UID Number. </b> Enter the user or administrator's UNIX ID number.
</p>
<p class="text">
-<b>GID Number.</b> (Optional) Enter the user or administrator's UNIX group ID number.
+<b>GID Number.</b> Enter the user or administrator's UNIX group ID number.
</p>
<p class="text">
-<b>Home Directory.</b> (Optional) Enter the path to the user or administrator's home directory. For example, <code>/u/jdoe</code>.
+<b>Home Directory.</b> Enter the path to the user or administrator's home directory. For example, <code>/u/jdoe</code>.
</p>
<p class="text">
<b>Login Shell.</b> (Optional) Enter the path to the user or administrator's login shell. For example, <code>/usr/local/bin/tcsh</code>.
Index: search_users_and_groups_advanced.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/search_users_and_groups_advanced.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- search_users_and_groups_advanced.html 9 Aug 2007 16:04:04 -0000 1.1
+++ search_users_and_groups_advanced.html 7 Dec 2007 01:27:47 -0000 1.2
@@ -74,5 +74,5 @@
<b>Search (button).</b> Click to begin searching.
</p>
<p class="text">
-<b>Basic.</b> Click to view fewer fields.
+<b>By Filter (button).</b> Click to use the search by filter.
</p>
16 years, 4 months
[Fedora-directory-commits] admservconsole/help/en tokens.map, 1.3, 1.4
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/admservconsole/help/en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8577
Modified Files:
tokens.map
Log Message:
Resolves: #159011
Summary: online help for details of CRL missing (Comment #6,7)
Description: adding a missing map for the token CertificateDetailDialog_CRL:
CertificateDetailDialog_CRL-help = help/list_crl_ckl.html
And piggybacking to fix replication-monitor token.
Index: tokens.map
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/tokens.map,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tokens.map 14 Nov 2007 16:46:15 -0000 1.3
+++ tokens.map 7 Dec 2007 01:27:47 -0000 1.4
@@ -144,6 +144,7 @@
;MANAGE REVOKED CERTIFICATES
CRLCertificatePane-help = help/manage_certificates_revoked_certs.html
InstallCRLDialog-help = help/add_crl_ckl.html
+CertificateDetailDialog_CRL-help = help/list_crl_ckl.html
;SECURITY - CONFIGURE SECURITY MODULES
PKCSConfigDialog-help = help/configure_security_modules.html
@@ -192,5 +193,5 @@
HTMLAdmin = help/administration_express.html
ViewData = help/administration_express_server_information.html
ViewLog = help/administration_express_logs.html
-replication-Monitor = help/replication_monitor.html
+MonReplication = help/replication_monitor.html
;End
16 years, 4 months
[Fedora-directory-commits] adminserver/admserv/newinst/src AdminMigration.pm.in, 1.6, 1.7 AdminServer.pm.in, 1.11, 1.12
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30317/adminserver/admserv/newinst/src
Modified Files:
AdminMigration.pm.in AdminServer.pm.in
Log Message:
Resolves: bug 400421
Bug Description: unable to restart configDS via console
Reviewed by: nhosoi (Thanks!)
Fix Description: We were using the old format for the ldapStart directive, which assumed everything was under a serverroot, so it just stored the relative path. We need the absolute path. During regular setup, we can get this from the directory server instance. During migration, we need to update the ldapStart directive to use the absolute path, so we need to get that information from the directory server code.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: AdminMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminMigration.pm.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AdminMigration.pm.in 14 Sep 2007 21:26:08 -0000 1.6
+++ AdminMigration.pm.in 7 Dec 2007 00:09:36 -0000 1.7
@@ -34,6 +34,7 @@
use SetupLog;
use File::Path;
+use File::Spec qw(file_name_is_absolute);
# tempfiles
use File::Temp qw(tempfile tempdir);
@@ -480,6 +481,16 @@
$mig->{inf}->{admin}->{sie} =~ s/\bNetscape\b/@capbrand@/g;
$mig->{inf}->{admin}->{isie} =~ s/\bNetscape\b/@capbrand@/g;
+ # update ldapStart
+ # if ldapStart is not an absolute path, we need to add
+ # the directory server instance dir (ServerRoot) to it
+ if ($mig->{inf}->{admin}->{ldapStart} &&
+ !file_name_is_absolute($mig->{inf}->{admin}->{ldapStart})) {
+ debug(1, "Need to make ldapStart an absolute path - ", $mig->{ServerRoot}, "/",
+ $mig->{inf}->{admin}->{ldapStart}, "\n");
+ $mig->{inf}->{admin}->{ldapStart} = $mig->{ServerRoot} . "/" . $mig->{inf}->{admin}->{ldapStart};
+ }
+
if (!updateAdmConf({ldapurl => $mig->{inf}->{General}->{ConfigDirectoryLdapURL},
userdn => $mig->{inf}->{General}->{ConfigDirectoryAdminID},
SuiteSpotUserID => $mig->{inf}->{General}->{SuiteSpotUserID},
Index: AdminServer.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminServer.pm.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AdminServer.pm.in 20 Sep 2007 01:01:21 -0000 1.11
+++ AdminServer.pm.in 7 Dec 2007 00:09:36 -0000 1.12
@@ -157,8 +157,8 @@
my @start_slapd;
if ($setup->{inf}->{slapd}->{SlapdConfigForMC} =~ /yes/i) {
- my $slapdid = $setup->{inf}->{slapd}->{ServerIdentifier};
- @start_slapd = ('ldapStart', "slapd-$slapdid/start-slapd");
+ my $inst_dir = $setup->{inf}->{slapd}->{inst_dir};
+ @start_slapd = ('ldapStart', "$inst_dir/start-slapd");
}
$setup->msg('updating_admconf');
my $rc = updateAdmConf({ldapurl => $setup->{inf}->{General}->{ConfigDirectoryLdapURL},
16 years, 4 months
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSMigration.pm.in, 1.23, 1.24 Util.pm.in, 1.13, 1.14
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30274/ldapserver/ldap/admin/src/scripts
Modified Files:
DSMigration.pm.in Util.pm.in
Log Message:
Resolves: bug 400421
Bug Description: unable to restart configDS via console
Reviewed by: nhosoi (Thanks!)
Fix Description: We were using the old format for the ldapStart directive, which assumed everything was under a serverroot, so it just stored the relative path. We need the absolute path. During regular setup, we can get this from the directory server instance. During migration, we need to update the ldapStart directive to use the absolute path, so we need to get that information from the directory server code.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: DSMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSMigration.pm.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DSMigration.pm.in 14 Nov 2007 15:12:09 -0000 1.23
+++ DSMigration.pm.in 7 Dec 2007 00:08:25 -0000 1.24
@@ -895,6 +895,16 @@
my $mig = shift;
my @errs;
+ # migration needs to know the instance directory for the directory
+ # servers - this assumes they are all in the same place
+ if (!$mig->{ServerRoot}) {
+ if ("@with_fhs_opt@") {
+ $mig->{ServerRoot} = "$inf->{General}->{prefix}/opt/@PACKAGE_NAME@";
+ } else {
+ $mig->{ServerRoot} = "$inf->{General}->{prefix}@serverdir@";
+ }
+ }
+
# for each instance
foreach my $inst (@{$mig->{instances}}) {
if (-f "$mig->{configdir}/$inst/dse.ldif") {
Index: Util.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Util.pm.in 21 Nov 2007 20:27:38 -0000 1.13
+++ Util.pm.in 7 Dec 2007 00:08:25 -0000 1.14
@@ -829,8 +829,20 @@
last if ($ent->hasValue('cn', 'userRoot', 1));
$ent = $conn->nextEntry();
}
+
+ # we also need the instance dir
+ $ent = $conn->search("cn=config", "base", "(objectclass=*)");
+ if (!$ent) {
+ push @{$errs}, "error_opening_dseldif", $fname, $!;
+ close $outfh;
+ $conn->close();
+ return 0;
+ }
+ my $inst_dir = $ent->getValue('nsslapd-instancedir');
+
$conn->close();
+ print $outfh, "inst_dir = $inst_dir\n";
print $outfh "Suffix = $suffix\n";
close $outfh;
16 years, 4 months
[Fedora-directory-commits] adminserver/lib/libadmin template.c, 1.8, 1.9
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/lib/libadmin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10903/lib/libadmin
Modified Files:
template.c
Log Message:
Resolves: #411231
Summary: [Admin express] help button brings up an error page
Description: mapfile info (tokens.map) was missing from help.js and template.c.
Index: template.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libadmin/template.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- template.c 9 May 2007 00:26:37 -0000 1.8
+++ template.c 6 Dec 2007 17:08:35 -0000 1.9
@@ -382,7 +382,7 @@
* URL changed to add new "mapfile" parameter for 5.0 help system - Adam
*/
util_snprintf( line, sizeof(line),
- "window.open('%s/manual/help/help?helpdir=admin&token=%s', '"
+ "window.open('%s/manual/help/help?helpdir=admin&token=%s&mapfile=tokens.map', '"
INFO_IDX_NAME"_%s', "
HELP_WIN_OPTIONS");",
getenv("SERVER_URL"), topic,
16 years, 4 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 help.js, 1.2, 1.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10903/admserv/cgi-src40
Modified Files:
help.js
Log Message:
Resolves: #411231
Summary: [Admin express] help button brings up an error page
Description: mapfile info (tokens.map) was missing from help.js and template.c.
Index: help.js
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/help.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- help.js 18 Aug 2005 18:59:03 -0000 1.2
+++ help.js 6 Dec 2007 17:08:35 -0000 1.3
@@ -38,7 +38,7 @@
function
help(helpdir, token)
{
- newlocation = manualBase()+"/help/" + helpCommand() + "?helpdir="+helpdir+"&token="+token;
+ newlocation = manualBase()+"/help/" + helpCommand() + "?helpdir="+helpdir+"&token="+token+"&mapfile=tokens.map";
if (top.HelpWindow)
{
16 years, 4 months
[Fedora-directory-commits] directoryconsole/help/en header.html, 1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/directoryconsole/help/en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19243
Modified Files:
header.html
Log Message:
Resolves: #379191
Summary: Online help: Directory Console (ds-console) (Comment #14)
Description: CSS header file provided by Deon.
Index: header.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/header.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- header.html 13 Aug 2007 22:28:09 -0000 1.1
+++ header.html 6 Dec 2007 02:59:34 -0000 1.2
@@ -3,18 +3,17 @@
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
<title>Fedora Management Console and Directory Server Help</title>
<style type="text/css">
- *.booktitle {font-size: 20px; font-weight: bold;}
+ body {width:600px;margin:auto;padding:10px;}
+ *.booktitle {font-size: 20px; font-family:arial;color:#555555;}
*.caution{;}
- *.code {;}
+ *.code {background-color:#eae7c9;padding-left:20px;border:1px dotted #555555}
+ *.variable {font-family:courier;font-size:9pt;}
*.copy {font-size: 10px;}
- *.topic {font-size: 18px; font-weight: bold;}
+ *.topic {font-size: 18px;font-family:arial;color:#a70000; font-weight: bold;}
*.h2 {font-weight: bold;}
- *.text {font-size: 14px;}
- </style>
-</head>
-
+ *.text {font-size: 12px;font-family:arial;color:#555555;}
+ </style> </head>
<body>
<span class="booktitle">Fedora Management Console and Directory Server Help</span>
<hr size="1" noshade="noshade" />
- <br />
<blockquote>
16 years, 4 months
[Fedora-directory-commits] admservconsole/help/en header.html, 1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/admservconsole/help/en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18950
Modified Files:
header.html
Log Message:
Resolves: #379191
Summary: Online help: Directory Console (ds-console) (Comment #14)
Description: CSS header file provided by Deon.
Index: header.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/header.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- header.html 9 Aug 2007 16:04:03 -0000 1.1
+++ header.html 6 Dec 2007 02:53:44 -0000 1.2
@@ -3,18 +3,17 @@
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
<title>Fedora Management Console and Administration Server Help</title>
<style type="text/css">
- *.booktitle {font-size: 20px; font-weight: bold;}
+ body {width:600px;margin:auto;padding:10px;}
+ *.booktitle {font-size: 20px; font-family:arial;color:#555555;}
*.caution{;}
- *.code {;}
+ *.code {background-color:#eae7c9;padding-left:20px;border:1px dotted #555555}
+ *.variable {font-family:courier;font-size:9pt;}
*.copy {font-size: 10px;}
- *.topic {font-size: 18px; font-weight: bold;}
+ *.topic {font-size: 18px;font-family:arial;color:#a70000; font-weight: bold;}
*.h2 {font-weight: bold;}
- *.text {font-size: 14px;}
- </style>
-</head>
-
+ *.text {font-size: 12px;font-family:arial;color:#555555;}
+ </style> </head>
<body>
<span class="booktitle">Fedora Management Console and Administration Server Help</span>
<hr size="1" noshade="noshade" />
- <br />
<blockquote>
16 years, 4 months