CVS: ispman/scripts make.pl,1.17,1.18 makedocs,1.5,1.6 automerge,1.1,NONE autosplit,1.1,NONE comment_pod,1.1,NONE uncomment_pod,1.1,NONE

Update of /cvsroot/ispman/ispman/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv23200/scripts

Modified Files:
	make.pl makedocs 
Removed Files:
	automerge autosplit comment_pod uncomment_pod 
Log Message:
rollback of HEAD to REL_1_0 versions
former HEAD development will continue in "experimental-branch" and merged back here
(more info on ispman-developer maillist and upcoming README.cvs in HEAD)


Index: make.pl
===================================================================
RCS file: /cvsroot/ispman/ispman/scripts/make.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** make.pl	2 Jan 2004 14:34:00 -0000	1.17
--- make.pl	4 Jan 2004 18:56:16 -0000	1.18
***************
*** 164,168 ****
           ldapHost 
           ldapInstallPath
-          ldapVersion
           imapAdminUsername
           imapAdminPass
--- 164,167 ----
***************
*** 177,183 ****
           mingid
           maxgid
-          pid_file
-          log_file
-          msgSpoolDir
  	)],
        'optional' => 1,  # this should not be 1 , otherwise default substitution will take place
--- 176,179 ----
***************
*** 228,239 ****
             question => "When creating users or domains, what is the maximum gid that I should use",
     },
-    pid_file	=> {
-            default => '',
-            question => "Where would you like the ispman-agent pid file created, blank means default location",
-    },
-    log_file	=> {
-            default => '',
-            question => "Where would you like the ispman-agent log file created, blank means default location",
-    },
     debug => {
             default => '1',
--- 224,227 ----
***************
*** 292,299 ****
                  
        },
-       ldapVersion => {
-                 default => 3,
-                 question => "What is the LDAP version your server is running?",
-       },
  	imapAdminPass => {
  		default => 'cyrus',
--- 280,283 ----
***************
*** 327,335 ****
                 question => "prefix for ispman URI.\nIf you want to run on a dedicated server or a Virtualhost, \nyou can leave this value blank\n\nPlease leave it blank at the moment",
                 },
!    	msgSpoolDir => {
! 		default => '/tmp',
! 		question => "Directory where user notification messages are temporarily stored.",
! 		
! 	},
    };
  
--- 311,315 ----
                 question => "prefix for ispman URI.\nIf you want to run on a dedicated server or a Virtualhost, \nyou can leave this value blank\n\nPlease leave it blank at the moment",
                 },
! 
    };
  
***************
*** 362,368 ****
  	*Config=*ISPMan::Config;
  	$Config->{'imapHosts'}=join " ", @{$Config->{'imapHosts'}};
- 	# now read the new conf file so new InstallPath can be found if defined via --prefix
- 	do $CONF_FILE;
- 
  	for (keys %$Config){
  		$vars->{$_}{'default'}=$Config->{$_};
--- 342,345 ----

Index: makedocs
===================================================================
RCS file: /cvsroot/ispman/ispman/scripts/makedocs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6

--- automerge DELETED ---

--- autosplit DELETED ---

--- comment_pod DELETED ---

--- uncomment_pod DELETED ---



-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click