From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 17 Jan 2007 20:50:40 -0000 Subject: [Cluster-devel] conga/luci/cluster resource-form-macros resour ... Message-ID: <20070117205040.4580.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Changes by: rmccabe at sourceware.org 2007-01-17 20:50:39 Modified files: luci/cluster : resource-form-macros resource_form_handlers.js Log message: Support for the new resources in RHEL4.5 Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.25&r2=1.26 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&r1=1.25&r2=1.26 --- conga/luci/cluster/resource-form-macros 2006/12/05 06:44:09 1.25 +++ conga/luci/cluster/resource-form-macros 2007/01/17 20:50:38 1.26 @@ -129,6 +129,18 @@
+ + +
+ + + +
+
+
+
+
+
@@ -353,7 +365,7 @@ + checked res/attrs/monitor_link | string: checked" /> @@ -796,11 +808,660 @@ + value res/attrs/options | nothing" /> + + + + + Allow Recover + + + + + + +
+ +
+ +
+

PostgreSQL 8 Configuration

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name + +
Config File + +
Postmaster User + +
Postmaster Options + +
Shutdown Wait (seconds) + +
+
+ +
+ +
+

Apache Configuration

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name + +
Server Root + +
Config File + +
httpd Options + +
Shutdown Wait (seconds) + +
+
+ +
+ +
+

Open LDAP Configuration

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name + +
Config File + +
URL List + +
slapd Options + +
Shutdown Wait (seconds) +
+
+ +
+ +
+

MySQL Configuration

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name + +
Config File + +
Listen Address + +
mysqld Options + +
Shutdown Wait (seconds) + +
+
+ +
+ +
+

Virtual Machine Configuration

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name + +
Domain + +
Recovery Options + +
Memory Size + +
Bootloader + +
Config File + +
Root disk for the VM (physical, on the host) + +
Root disk for the VM (as presented to the VM) + +
Swap disk for the VM (physical, on the host) + +
Swap disk for the VM (as presented to the VM) + +
Virtual interface MAC address + +
+
+ +
+ +
+

Tomcat 5 Configuration

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name + +
Config File + +
Tomcat User + +
Catalina Options + +
Catalina Base + +
Shutdown Wait (seconds) + +
--- conga/luci/cluster/resource_form_handlers.js 2006/12/06 22:44:18 1.25 +++ conga/luci/cluster/resource_form_handlers.js 2007/01/17 20:50:38 1.26 @@ -98,6 +98,25 @@ return (errors); } +function validate_apache(form) { +} + +function validate_tomcat5(form) { +} + +function validate_postgres8(form) { +} + +function validate_mysql(form) { +} + +function validate_openldap(form) { +} + +function validate_vm(form) { +} + + function validate_nfs_mount(form) { var errors = new Array(); @@ -211,6 +230,14 @@ return (errors); } +var required_children = new Array(); +var required_children['nfsx'] = [ 'nfsc' ]; + +var forbidden_children = new Array(); +var forbidden_children['ip'] = [ 'nfsc', 'nfsx' ]; +var forbidden_children['netfs'] = [ 'nfsc', 'nfsx' ]; +var forbidden_children['nfsx'] = [ 'nfsx' ]; + var form_validators = new Array(); form_validators['ip'] = validate_ip; form_validators['nfsm'] = validate_nfs_mount; @@ -220,6 +247,12 @@ form_validators['gfs'] = validate_gfs; form_validators['scr'] = validate_script; form_validators['smb'] = validate_samba; +form_validators['vm'] = validate_vm; +form_validators['apache'] = validate_apache; +form_validators['tomcat-5'] validate_tomcat5; +form_validators['postgres-8'] validate_postgres8; +form_validators['openldap'] = validate_openldap; +form_validators['mysql'] = validate_mysql; function check_form(form) { var valfn = form_validators[form.type.value]; @@ -415,11 +448,12 @@ { temp += ''; } else if (res_type == 'checkbox' || res_type == 'radio') { - if (input_elem[j].checked) + if (input_elem[j].checked) { temp += '