ispman/install-data/ldifs conf.apache_vars.ldif, 1.20, 1.21 conf.dns_vars.ldif, 1.10, 1.11 conf.mail_vars.ldif, 1.5, 1.6 conf.sys_vars.ldif, 1.9, 1.10

Update of /cvsroot/ispman/ispman/install-data/ldifs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21579/install-data/ldifs

Modified Files:
	conf.apache_vars.ldif conf.dns_vars.ldif conf.mail_vars.ldif 
	conf.sys_vars.ldif 
Log Message:
merged branch dev_1_3-cyrus_virtdomain2

Index: conf.sys_vars.ldif
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/ldifs/conf.sys_vars.ldif,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- conf.sys_vars.ldif	5 May 2006 22:28:51 -0000	1.9
+++ conf.sys_vars.ldif	21 Nov 2006 14:41:28 -0000	1.10
@@ -18,7 +18,7 @@
 ispmanVarAlias: User Password Hash Method
 ispmanModule: sys_vars
 ispmanVal: crypt
-ispmanQuestion: The hash method to use for user passwords, choose one of: clear, crypt, md5, sha
+ispmanQuestion: The hash method to use for user passwords, choose one of: <b>clear</b>, <b>crypt</b>, <b>md5</b>, <b>sha</b>.
 
 dn: ispmanVar=sleepSecondsBetweenRestart, ispmanModule=sys_vars, ou=conf, %%ldapBaseDN%%
 objectclass: ispmanConfVar
@@ -34,7 +34,7 @@
 ispmanVarAlias: Installation Directory
 ispmanModule: sys_vars
 ispmanVal: %%installDir%%
-ispmanQuestion: Directory where you want to install ispman components.<br>You may choose to install in on an NFS partition so that you can share the same files with multiple machines.<br>It is recommended to install at /opt/ispman
+ispmanQuestion: Directory where you want to install ispman components.<br>You may choose to install in on an NFS partition so that you can share the same files with multiple machines.<br>It is recommended to install at <tt>/opt/ispman</tt>.
 
 dn: ispmanVar=rootEmail, ispmanModule=sys_vars, ou=conf, %%ldapBaseDN%%
 objectclass: ispmanConfVar
@@ -50,5 +50,5 @@
 ispmanVarAlias: Menu Mode
 ispmanModule: sys_vars
 ispmanVal: list
-ispmanQuestion: Defines behavior of menu mode.<br>A setting of "list" will show all domains in the drop down list.<br>A setting of "search" presents only a search option.
+ispmanQuestion: Defines behavior of menu mode.<br>A setting of "<b>list</b>" will show all domains in the drop down list.<br>A setting of "<b>search</b>" presents only a search option.
 

Index: conf.apache_vars.ldif
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/ldifs/conf.apache_vars.ldif,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- conf.apache_vars.ldif	7 Feb 2005 19:01:02 -0000	1.20
+++ conf.apache_vars.ldif	21 Nov 2006 14:41:28 -0000	1.21
@@ -18,7 +18,7 @@
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
 ispmanVal: file
-ispmanQuestion: Apache entries in the a file or directory (file/dir)
+ispmanQuestion: Apache entries in a file or directory (file/dir)
 
 dn: ispmanVar=apacheVhostsTemplate, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
 ispmanVar: apacheVhostsTemplate
@@ -74,7 +74,9 @@
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
 ispmanVal: /ispman/logs
-ispmanQuestion: Directory where Apache's logs are kept (relative path will be appended to vhost's homedir). Allowed tokens: %vhost%, %domain% (will be substituted with actual vhost/domain name on creation of vhost)
+ispmanQuestion: Directory where Apache's logs are kept (relative path will be appended 
+ to vhost's homedir).<br>Allowed tokens: <b><tt>%vhost%</tt></b>, <b><tt>%domain%</tt></b> 
+ (will be substituted with actual vhost/domain name on creation of vhost).
 
 dn: ispmanVar=apacheStatDirectory, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
 ispmanVar: apacheStatDirectory
@@ -82,7 +84,9 @@
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
 ispmanVal: /ispman/domain
-ispmanQuestion: Directory where Apache's Stats are kept (relative path will be appended to vhost's homedir). Allowed tokens: %vhost%, %domain% (will be substituted with actual vhost/domain name on creation of vhost)
+ispmanQuestion: Directory where Apache's Stats are kept (relative path will be appended 
+ to vhost's homedir).<br>Allowed tokens: <b><tt>%vhost%</tt></b>, <b><tt>%domain%</tt></b> 
+ (will be substituted with actual vhost/domain name on creation of vhost).
 
 dn: ispmanVar=apacheWebalizerPath, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
 ispmanVar: apacheWebalizerPath
@@ -98,7 +102,9 @@
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
 ispmanVal: no
-ispmanQuestion: If your webserver is compiled with mod_ldap_userdir, then you can set this value to yes.<br>Setting this to yes, will add support for user home directories for virtualHosts. Example http://www.domain.tld/~username/
+ispmanQuestion: If your webserver is compiled with mod_ldap_userdir, then you can set 
+ this value to '<b>yes</b>'.<br>Setting this to '<b>yes</b>', will add support for 
+ user home directories for virtualHosts. Example http://www.domain.tld/~username/
 
 dn: ispmanVar=apacheGracefulCommand, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
 ispmanVar: apacheGracefulCommand
@@ -106,7 +112,7 @@
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
 ispmanVal: /etc/rc.d/init.d/httpd graceful
-ispmanQuestion: To use the ispman.makelogs command line tool for logfile processing you need to specify the command to gracefully restart your apache.
+ispmanQuestion: To use the <tt>ispman.makelogs</tt> command line tool for logfile processing you need to specify the command to gracefully restart your apache.
 
 dn: ispmanVar=apacheGracefulTime, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
 ispmanVar: apacheGracefulTime
@@ -114,7 +120,9 @@
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
 ispmanVal: 600
-ispmanQuestion: Here you may specify the time in seconds left for apache to close all open connections after a graceful restart. During this time the apache is reachable of course. It just sends a script to bed for this time.
+ispmanQuestion: Here you may specify the time in seconds left for apache to close all 
+ open connections after a graceful restart.<br>During this time the apache is reachable 
+ of course. It just sends a script to bed for this time.
 
 dn: ispmanVar=apacheVhostLogDefault, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
 ispmanVar: apacheVhostLogDefault
@@ -146,7 +154,7 @@
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
 ispmanVal: *Indexes,ExecCGI,Includes,*FollowSymLinks,*MultiViews
-ispmanQuestion: Available options for vhost's document root. Precede option with "*" to make it a default option.
+ispmanQuestion: Available options for vhost's document root. Precede option with "<b>*</b>" to make it a default option.
 
 dn: ispmanVar=apacheScriptDirOptions, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
 ispmanVar: apacheScriptDirOptions
@@ -154,7 +162,7 @@
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
 ispmanVal: Indexes,*ExecCGI,Includes,FollowSymLinks,MultiViews
-ispmanQuestion: Available options for vhost's script dir. Precede option with "*" to make it a default option.
+ispmanQuestion: Available options for vhost's script dir. Precede option with "<b>*</b>" to make it a default option.
 
 dn: ispmanVar=apacheSuspendDirective, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
 ispmanVar: apacheSuspendDirective

Index: conf.mail_vars.ldif
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/ldifs/conf.mail_vars.ldif,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- conf.mail_vars.ldif	4 May 2002 22:27:22 -0000	1.5
+++ conf.mail_vars.ldif	21 Nov 2006 14:41:28 -0000	1.6
@@ -34,7 +34,9 @@
 ispmanModule: mail_vars
 objectclass: ispmanConfVar
 ispmanVal: user.
-ispmanQuestion: The mailbox prefix. For Cyrus set this to 'user.'. For Courier set this to Maildir/
+ispmanQuestion: The mailbox prefix. For Courier set this to '<b><tt>Maildir/</tt></b>'. 
+ For Cyrus, if '<b>cyrusVirtDomainFeature</b>' config var<br>is set to 'yes', then set 
+ this to '<b><tt>user/</tt></b>' else, set it to '<b><tt>user.</tt></b>'.
 
 dn: ispmanVar=imapServerBackend, ispmanModule=mail_vars, ou=conf, %%ldapBaseDN%%
 ispmanVar: imapServerBackend
@@ -44,4 +46,28 @@
 ispmanVal: cyrus
 ispmanQuestion: IMAP server backend. currently supported are 'cyrus' and 'courier'
 
+dn: ispmanVar=cyrusVirtDomainFeature, ispmanModule=mail_vars, ou=conf, %%ldapBaseDN%%
+ispmanVar: cyrusVirtDomainFeature
+ispmanVarAlias: Use the cyrus virtdomain feature
+ispmanModule: mail_vars
+objectclass: ispmanConfVar
+ispmanVal: no
+ispmanQuestion: Defines how Cyrus IMAP Server handles mailbox names. 
+ Usually this option is set to 'yes' when Cyrus needs<br>to accept logins in 
+ the form of <b><tt>'[email protected]'</tt></b> instead of 
+ <b><tt>'username_domain_tld'</tt></b>.<br>This requires <b><tt>'virtdomains: 
+ on'</tt></b> or <b><tt>'virtdomains: userid'</tt></b> on cyrus 
+ <b><tt>'imapd.conf'</tt></b>. <br><b>NOTE: Don't change this with existing user data! 
+ It requires modifying your LDAP data accordingly, at your own risk.</b>
+
+dn: ispmanVar=defaultMailboxFolders, ispmanModule=mail_vars, ou=conf, %%ldapBaseDN%%
+ispmanVar: defaultMailboxFolders
+ispmanVarAlias: Default Mailbox Folders
+ispmanModule: mail_vars
+objectclass: ispmanConfVar
+ispmanVal: Drafts Sent Trash
+ispmanQuestion: List of folders which will be automaticly created when adding a new 
+ mailbox. Separate folder names by a blank space.<br><b>NOTE: This is currently 
+ only supported by cyrus</b>.
+
 

Index: conf.dns_vars.ldif
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/ldifs/conf.dns_vars.ldif,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- conf.dns_vars.ldif	29 May 2006 19:43:58 -0000	1.10
+++ conf.dns_vars.ldif	21 Nov 2006 14:41:28 -0000	1.11
@@ -186,7 +186,9 @@
 ispmanModule: dns_vars
 objectclass: ispmanConfVar
 ispmanVal: none
-ispmanQuestion: DNS name which will be aliased from "*". This will catch all names that are not explicitly defined. This can work with bind8 and bind9 backend but not if you are using bind9 with sdb_ldap. Enter "none" to disable. 
+ispmanQuestion: DNS name which will be aliased from "<b>*</b>". This will catch all 
+ names that are not explicitly defined.<br>This can work with bind8 and bind9 backend 
+ but not if you are using bind9 with sdb_ldap.<br>Enter "<b>none</b>" to disable. 
 
 dn: ispmanVar=dnsSerialFormat, ispmanModule=dns_vars, ou=conf, %%ldapBaseDN%%
 ispmanVar: dnsSerialFormat
@@ -194,5 +196,5 @@
 ispmanModule: dns_vars
 objectclass: ispmanConfVar
 ispmanVal: date
-ispmanQuestion: DNS serial format to use ("timestamp" or "date")
+ispmanQuestion: DNS serial format to use ("<b>timestamp</b>" or "<b>date</b>")
 


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV