CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [EMAIL PROTECTED] 2008-04-11 06:50:33
Modified files:
. : conga.spec.in.in
luci/cluster : fence-macros
luci/init.d : luci
luci/site/luci/var/certs: cacert.config
luci/utils : luci_admin
Log message:
Fix 441573: "nodename" field for fence_scsi disabled when adding a new
fence device/instance
Generate serial numbers for self-signed certs to avoid Firefox locking
us out in certain situations.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.75&r2=1.45.2.76
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.2.1&r2=1.2.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/init.d/luci.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.11.2.4&r2=1.11.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/certs/cacert.config.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1&r2=1.1.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/utils/luci_admin.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.50.2.6&r2=1.50.2.7
--- conga/conga.spec.in.in 2008/03/24 23:18:22 1.45.2.75
+++ conga/conga.spec.in.in 2008/04/11 06:50:32 1.45.2.76
@@ -291,6 +291,9 @@
### changelog ###
%changelog
+* Thu Apr 10 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-7
+- Fix bz441573 ("nodename" field for fence_scsi disabled when adding a new
fence device/instance)
+
* Wed Feb 27 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-6
- Fix bz434586 (Resource tree does not display multiple children of a parent
correctly)
- Fix bz304931 (Rich Sybase resource agent configuration support)
--- conga/luci/cluster/fence-macros 2008/01/23 04:44:30 1.2.2.1
+++ conga/luci/cluster/fence-macros 2008/04/11 06:50:32 1.2.2.2
@@ -1849,7 +1849,7 @@
<tr>
<td>Node name</td>
<td>
- <input type="text" name="node"
disabled="disabled"
+ <input type="text" name="node"
tal:attributes="value
request/node | nothing" />
</td>
</tr>
--- conga/luci/init.d/luci 2008/02/07 06:52:56 1.11.2.4
+++ conga/luci/init.d/luci 2008/04/11 06:50:32 1.11.2.5
@@ -75,7 +75,7 @@
rm -f -- "$HTTPS_PRIVKEY" "$HTTPS_PUBKEY"
/usr/bin/openssl genrsa -out "$HTTPS_PRIVKEY" "$KEY_BITS" >&/dev/null
- /usr/bin/openssl req -new -x509 -key "$HTTPS_PRIVKEY" -out
"$HTTPS_PUBKEY" -days "$KEY_LIFE_DAYS" -config
/var/lib/luci/var/certs/cacert.config
+ /usr/bin/openssl req -new -x509 -key "$HTTPS_PRIVKEY" -out
"$HTTPS_PUBKEY" -days "$KEY_LIFE_DAYS" -set_serial "$(/bin/date +%s)" -config
/var/lib/luci/var/certs/cacert.config
/bin/chmod -- 600 "$HTTPS_PRIVKEY"
/bin/chmod -- 644 "$HTTPS_PUBKEY"
/bin/chown -- $LUCI_USER:$LUCI_GROUP "$HTTPS_PRIVKEY" "$HTTPS_PUBKEY"
--- conga/luci/site/luci/var/certs/cacert.config 2006/06/02 00:14:28
1.1
+++ conga/luci/site/luci/var/certs/cacert.config 2008/04/11 06:50:33
1.1.2.1
@@ -6,10 +6,10 @@
[ req_distinguished_name ]
C = US
ST = State or Province
-L = Locality
-O = Organization Name
-OU = Organizational Unit Name
-CN = Common Name
-emailAddress = [EMAIL PROTECTED]
+L = Conga
+O = Conga
+OU = Conga
+CN = luci server
+emailAddress = [EMAIL PROTECTED]
[ req_attributes ]
--- conga/luci/utils/luci_admin 2008/01/23 04:44:57 1.50.2.6
+++ conga/luci/utils/luci_admin 2008/04/11 06:50:33 1.50.2.7
@@ -10,6 +10,7 @@
import sys, os, pwd
from select import select
from stat import S_ISREG
+from time import time
import types
import xml
import xml.dom
@@ -1051,7 +1052,7 @@
# /usr/bin/openssl req -new -x509 -key
/var/lib/luci/var/certs/privkey.pem -out /var/lib/luci/var/certs/cacert.pem
-days 1825 -config /var/lib/luci/var/certs/cacert.config
command = '/usr/bin/openssl'
- args = [ command, 'req', '-new', '-x509', '-key', SSL_PRIVKEY_PATH,
'-out', SSL_PUBKEY_PATH, '-days', '1825', '-config', SSL_KEYCONFIG_PATH ]
+ args = [ command, 'req', '-new', '-x509', '-key', SSL_PRIVKEY_PATH,
'-out', SSL_PUBKEY_PATH, '-days', '1825', '-set_serial', str(int(time())),
'-config', SSL_KEYCONFIG_PATH ]
exec_cmd(command, args)
# take ownership and restrict access
