ispman/bin ispman-agent,1.63,1.64 ispman.addDomain,1.8,1.9 ispman.addMailGroup,1.5,1.6 ispman.addUser,1.10,1.11 ispman.addvhost,1.13,1.14 ispman.bumpMailboxQuota,1.4,1.5 ispman.commitSession,1.4,1.5 ispman.createSubMailbox,1.2,1.3 ispman.dnsdump,1.7,1.8 ispman.dnsshow,1.9,1.10 ispman.domainmail,1.3,1.4 ispman.ldifdump,1.8,1.9 ispman.processdump,1.3,1.4
Joerg Delker <[email protected]>
| Newsgroups | gmane.comp.isp.ispman.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ispman/ispman/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16384/bin
Modified Files:
ispman-agent ispman.addDomain ispman.addMailGroup
ispman.addUser ispman.addvhost ispman.bumpMailboxQuota
ispman.commitSession ispman.createSubMailbox ispman.dnsdump
ispman.dnsshow ispman.domainmail ispman.ldifdump
ispman.processdump
Log Message:
applied spelling fix
(thanks to Mads Kiilerich)
Index: ispman.addDomain
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.addDomain,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ispman.addDomain 30 May 2004 23:35:31 -0000 1.8
+++ ispman.addDomain 5 Jun 2004 12:45:18 -0000 1.9
@@ -17,7 +17,7 @@
unless ( $opts{'d'} ) {
# perhaps using old syntax.
- # check if there are atleast two arguments
+ # check if there are at least two arguments
# and that the first one looks like a doamain
# if yes then feed it to $opts{'d'}
@@ -26,7 +26,7 @@
# Yes we have atlease 2 arguments 0 and 1
unless ( $ARGV[0] =~ m/\w+?\.?\w+/ ) {
print "First argument does not look like a domain\n";
- print "A domain should have atleast a dot in it\n";
+ print "A domain should have at least a dot in it\n";
exit;
}
print
@@ -87,8 +87,10 @@
$d->{'ispmanDomainDefaultFileServer'} = $ispmanDomainDefaultFileServer;
}
else {
- print
-"No host in fileserver group found. You cannot add domains untill you define some hosts in the fileservergroup\n";
+ print qq[
+No host found in fileserver group!
+You cannot add domains until you define some hosts in the fileservergroup.
+];
exit;
}
}
Index: ispman.dnsdump
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.dnsdump,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ispman.dnsdump 30 May 2004 23:35:31 -0000 1.7
+++ ispman.dnsdump 5 Jun 2004 12:45:18 -0000 1.8
@@ -102,7 +102,7 @@
B<ispman.dnsshow -d all -t MX >
-To see all all records for all domains (I dont know why though)
+To see all all records for all domains (I don't know why though)
B<ispman.dnsshow -d all -t any >
Index: ispman.addUser
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.addUser,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ispman.addUser 30 May 2004 23:35:31 -0000 1.10
+++ ispman.addUser 5 Jun 2004 12:45:18 -0000 1.11
@@ -63,11 +63,11 @@
my $domain = $ispman->getDomainInfo( $opts{'d'} );
unless ($domain) {
- print "unkown domain \"$opts{'d'}\"!\n";
+ print "unknown domain \"$opts{'d'}\"!\n";
exit 1;
}
-# If we dont want to create a mailbox for this user we
+# If we don't want to create a mailbox for this user we
# can specify -m none perhaps for just mailforwardings
unless ( $opts{"m"} eq "none" ) {
if ( $opts{"m"} ) {
Index: ispman.ldifdump
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.ldifdump,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ispman.ldifdump 30 May 2004 23:35:32 -0000 1.8
+++ ispman.ldifdump 5 Jun 2004 12:45:18 -0000 1.9
@@ -21,7 +21,7 @@
use vars qw($Config);
$|++;
-# In this small program, we dont need to load all the ISPMan::* modules
+# In this small program, we don't need to load all the ISPMan::* modules
# which are loaded when we call use ISPMan
# instead we just require the conf file and load only ISPMan::LDAP module
Index: ispman.domainmail
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.domainmail,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ispman.domainmail 30 May 2004 23:35:32 -0000 1.3
+++ ispman.domainmail 5 Jun 2004 12:45:18 -0000 1.4
@@ -14,7 +14,7 @@
}
unless ( $opts{'s'} ) {
print
-"Are you sure you want to send a mass email without a subject?\nI dont think so.\n";
+"Are you sure you want to send a mass email without a subject?\nI don't think so.\n";
exit;
}
unless ( $opts{'f'} ) {
Index: ispman.dnsshow
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.dnsshow,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ispman.dnsshow 30 May 2004 23:35:31 -0000 1.9
+++ ispman.dnsshow 5 Jun 2004 12:45:18 -0000 1.10
@@ -103,7 +103,7 @@
B<ispman.dnsshow -d all -t MX >
-To see all all records for all domains (I dont know why though)
+To see all all records for all domains (I don't know why though)
B<ispman.dnsshow -d all -t any >
Index: ispman.addMailGroup
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.addMailGroup,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ispman.addMailGroup 30 May 2004 23:35:31 -0000 1.5
+++ ispman.addMailGroup 5 Jun 2004 12:45:18 -0000 1.6
@@ -6,20 +6,19 @@
use Getopt::Std;
getopt( 'dfa', \%opts );
unless ( $opts{'d'} && $opts{'f'} && $ARGV[0] ) {
- print "$FindBin::Script -d domain -f forwardingAddress mailGroupName\n";
- print "\n";
- print "Example:\n";
- print
- "$FindBin::Script -d domain.tld -f postmaster\@domain.tld abuse\n";
- print
- "\nThis will create a mailGroup with the address abuse\@domain.tld\n";
- print
-" and all mails will be forwarded to the email address postmaster\@domain.tld\n\n";
- print
-"The forwarding address does not need to be in the same domain as the mailGroup\n";
- print
-"If you want more than one adress in the mailgroup, separate the adresses with two spaces\n";
- print "Like this: -f 'adress1 adress2' \n";
+ print qq[
+$FindBin::Script -d domain -f forwardingAddress mailGroupName
+
+Example:
+$FindBin::Script -d domain.tld -f postmaster\@domain.tld abuse
+
+This will create a mailGroup with the address \"abuse\@domain.tld\",
+which will forward all mails to \"postmaster\@domain.tld\".
+
+The forwarding address does not need to be in the same domain as the mailGroup.
+If you want more than one address in the mailgroup, separate the addresses
+with two spaces (e.g. \"-f 'adress1 adress2'\")
+];
exit;
}
}
Index: ispman.bumpMailboxQuota
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.bumpMailboxQuota,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ispman.bumpMailboxQuota 30 May 2004 23:35:31 -0000 1.4
+++ ispman.bumpMailboxQuota 5 Jun 2004 12:45:18 -0000 1.5
@@ -2,7 +2,7 @@
# For emergencies when every one is getting overQuota due to some spam or virus
# such as So F. Big
-# Bumps up the Cyrus mailbox quota for users who are overquota
+# Bumps up the Cyrus mailbox quota for users who are over quota
# As paramater, it can accept uid_filter
# such as *_ispman_org : default: *
# and number is bytes to bump up to : default: 1024
@@ -33,7 +33,7 @@
next unless $q[2];
if ( $q[1] >= $q[2] ) {
print
-"$uid is overquota. Quota: $q[2] , Used: $q[1], Over @{[$q[1]-$q[2]]}.\n";
+"$uid is over quota. Quota: $q[2] , Used: $q[1], Over @{[$q[1]-$q[2]]}.\n";
print "Bumping up $bytes bytes\n";
$newQuota = $q[2] + $bytes;
print "New Quota: $newQuota\n";
Index: ispman.commitSession
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.commitSession,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ispman.commitSession 30 May 2004 23:35:31 -0000 1.4
+++ ispman.commitSession 5 Jun 2004 12:45:18 -0000 1.5
@@ -9,7 +9,7 @@
exit unless @ARGV;
my $session = shift @ARGV;
-print "Commiting session $session\n";
+print "Committing session $session\n";
$ispman->releaseSession($session);
__END__
Index: ispman-agent
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman-agent,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- ispman-agent 31 May 2004 20:13:40 -0000 1.63
+++ ispman-agent 5 Jun 2004 12:45:18 -0000 1.64
@@ -43,7 +43,7 @@
$hostname = hostname(); # find hostname using Sys::Hostname. -End-Of-Story-
-#If you dont have Sys::Hostname, you probably cant run ispman anyway,
+#If you don't have Sys::Hostname, you probably cant run ispman anyway,
######## Additional hostnames by which this agent will ################
######## recognize processes for this host. ################
@@ -112,7 +112,7 @@
};
if ( -e $pid_file ) {
- print "pid file already exists? unclean shudown?\n";
+ print "pid file already exists? unclean shutdown?\n";
# This shouldn't exit here but it should perhaps use a killall $name ?
#exit(1);
Index: ispman.processdump
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.processdump,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ispman.processdump 30 May 2004 23:35:32 -0000 1.3
+++ ispman.processdump 5 Jun 2004 12:45:18 -0000 1.4
@@ -38,7 +38,7 @@
$hostname = hostname(); # find hostname using Sys::Hostname. -End-Of-Story-
-#If you dont have Sys::Hostname, you probably cant run ispman anyway,
+#If you don't have Sys::Hostname, you probably cant run ispman anyway,
@hostnames = split( /\s*,\s*/, $Config->{'hostnames'} );
push @hostnames, $hostname;
Index: ispman.addvhost
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.addvhost,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ispman.addvhost 30 May 2004 23:35:31 -0000 1.13
+++ ispman.addvhost 5 Jun 2004 12:45:18 -0000 1.14
@@ -10,8 +10,7 @@
getopt( 'dawp', \%opts );
unless ( $opts{'d'} && $opts{'d'} && $ARGV[0] ) {
print
-"$0 -d domain vhost [-w webhost1, ... ,webhostn] [-a alias] [-p password]";
- print "\n";
+"$0 -d domain [-w webhost1, ... ,webhostn] [-a alias] [-p password] vhost\n";
exit;
}
}
@@ -52,8 +51,10 @@
$r->param( "webHost", $_webhost );
}
else {
- print
-"No host in webserver is the group found. \nYou cannot add vhosts untill you define some hosts in the httpgroup\n";
+ print qq[
+No host found in webserver group!
+You cannot add vhosts until you define some hosts in the httpgroup
+];
exit;
}
Index: ispman.createSubMailbox
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.createSubMailbox,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ispman.createSubMailbox 30 May 2004 23:35:31 -0000 1.2
+++ ispman.createSubMailbox 5 Jun 2004 12:45:18 -0000 1.3
@@ -11,7 +11,7 @@
( $FindBin::Bin, "$FindBin::Bin/../lib", "$FindBin::Bin/../conf" );
require "cyrusadmin.pm";
unless ( $ARGV[1] ) {
- print "I need 2 paramters\n";
+ print "I need 2 parameters\n";
print "uid_filter: such as '*' or '*_some_domain'\n";
print "mailbox: the submailbox to create under INBOX\n";
exit;
-------------------------------------------------------
This SF.Net email is sponsored by the new InstallShield X.
From Windows to Linux, servers to mobile, InstallShield X is the one
installation-authoring solution that does it all. Learn more and
evaluate today! http://www.installshield.com/Dev2Dev/0504