Menu
▾
▴
ispman-cvs — cvs commits to this list
You can subscribe to this list here.
| 2001 |
Jan
(12) |
Feb
(33) |
Mar
(24) |
Apr
(109) |
May
(57) |
Jun
(27) |
Jul
(19) |
Aug
(14) |
Sep
(31) |
Oct
|
Nov
(26) |
Dec
(49) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(221) |
Feb
(447) |
Mar
(35) |
Apr
(456) |
May
(443) |
Jun
(98) |
Jul
(131) |
Aug
(3) |
Sep
(10) |
Oct
(1) |
Nov
(4) |
Dec
(31) |
| 2003 |
Jan
(100) |
Feb
(26) |
Mar
(72) |
Apr
(248) |
May
(36) |
Jun
(58) |
Jul
(146) |
Aug
(87) |
Sep
(29) |
Oct
(52) |
Nov
(1) |
Dec
(5) |
| 2004 |
Jan
(171) |
Feb
(101) |
Mar
|
Apr
(45) |
May
(79) |
Jun
(142) |
Jul
(64) |
Aug
(108) |
Sep
(7) |
Oct
(9) |
Nov
(3) |
Dec
(46) |
| 2005 |
Jan
(4) |
Feb
(7) |
Mar
(6) |
Apr
(24) |
May
(1) |
Jun
(11) |
Jul
(4) |
Aug
(3) |
Sep
(4) |
Oct
(17) |
Nov
(3) |
Dec
(1) |
| 2006 |
Jan
(4) |
Feb
|
Mar
(5) |
Apr
(5) |
May
(73) |
Jun
(46) |
Jul
(12) |
Aug
(8) |
Sep
(64) |
Oct
(123) |
Nov
(40) |
Dec
(1) |
| 2007 |
Jan
(10) |
Feb
(26) |
Mar
|
Apr
(10) |
May
(4) |
Jun
(59) |
Jul
(18) |
Aug
(3) |
Sep
|
Oct
|
Nov
(4) |
Dec
|
| 2008 |
Jan
(2) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(50) |
| 2009 |
Jan
(33) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Joerg D. <jd...@us...> - 2009-07-25 19:33:17
|
Update of /cvsroot/ispman/ispman/lib In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1987 Modified Files: database.MySQL.lib Log Message: fixed bug with "-" in DB name modified tmp file handling Index: database.MySQL.lib =================================================================== RCS file: /cvsroot/ispman/ispman/lib/database.MySQL.lib,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- database.MySQL.lib 6 Feb 2009 10:13:17 -0000 1.5 +++ database.MySQL.lib 25 Jul 2009 19:33:07 -0000 1.6 @@ -1,15 +1,21 @@ +use File::Temp; + +# get MySQL Admin credentials $dbadmin = $ispman->getConf("dbAdminName"); $dbpass = $ispman->getConf("dbAdminPass"); -$defaultsfile = "/tmp/ispman.mysql.cnf"; +# create tmp dir +my $tmpdir = File::Temp::tempdir(CLEANUP => 1); -%cmnds = ( +my $mysql_defaults = "$tmpdir/ispman.mysql.cnf"; + +my %cmnds = ( mysql => "mysql", mysqladmin => "mysqladmin", mysqldump => "mysqldump" ); -sysopen( DEF, $defaultsfile, O_WRONLY | O_TRUNC | O_CREAT, 0600 ) - || die("unable to create $defaultsfile"); +sysopen( DEF, $mysql_defaults, O_WRONLY | O_TRUNC | O_CREAT, 0600 ) + || die("unable to create $mysql_defaults"); print DEF qq| [client] host = localhost @@ -19,6 +25,17 @@ |; close DEF; +sub build_exec { + my $sql = shift; + + my ($fh, $filename) = File::Temp::tempfile(DIR => $tmpdir); + + print $fh $sql; + close $fh; + + return "$cmnds{'mysql'} --defaults-file=$mysql_defaults < $filename"; +} + # prepare MySQL user notation sub sql_user { my ( $user, $host ) = @_; @@ -48,7 +65,7 @@ . " AND Host=\'" . $params->{'ispmanDBAccessFilter'} . "\';"; $sql .= "GRANT " . join( ",", @privs ) - . " ON " . $params->{'ispmanDBName'} . ".*" + . " ON `" . $params->{'ispmanDBName'} . "`.*" . " TO " . sql_user( $params->{'ispmanDBUser'}, $params->{'ispmanDBAccessFilter'} ) . " IDENTIFIED BY PASSWORD \'" . $params->{'ispmanDBPass'} . "\'" . (( scalar(@priv_opts) > 0 ) ? " WITH " . join( ",", @priv_opts ) : "") . ";"; @@ -59,13 +76,12 @@ sub add_database { my $params = shift; - my $sql = "CREATE DATABASE " . $params->{'ispmanDBName'} . " IF NOT EXISTS;"; + my $sql = "CREATE DATABASE `" . $params->{'ispmanDBName'} . "`;"; $sql .= sql_grant($params); $sql .= "use " . $params->{'ispmanDBName'} . ";"; - $sql .= join ";", map { "\\. " . ((/^\//)?$_:($ispman->getConf{'installDir'}."/tasks/$_")) } + $sql .= join ";", map { "\\. " . (($_ =~ /^\//)?$_:($ispman->getConf('installDir')."/tasks/$_")) } split('\|',$params->{'actions'}); - - return "echo \"$sql\" | $cmnds{'mysql'} --defaults-file=$defaultsfile"; + return build_exec($sql); } @@ -113,7 +129,7 @@ $sql .= "FLUSH PRIVILEGES;"; } - return "echo \"$sql\" | $cmnds{mysql} --defaults-file=$defaultsfile" if $sql; + return build_exec($sql); } @@ -122,12 +138,12 @@ my $params = shift; my $sql = - "DELETE FROM mysql.user " - . "WHERE User=\'" . $params->{'ispmanDBUser'} . "\' " - . "AND Host=\'" . $params->{'ispmanDBAccessFilter'} . "\';"; - $sql .= "DROP DATABASE " . $params->{'ispmanDBName'} . ";"; + "DROP USER " + . sql_user( $params->{'ispmanDBUser'}, $params->{'ispmanDBAccessFilter'} ) + . ";"; + $sql .= "DROP DATABASE `" . $params->{'ispmanDBName'} . "`;"; - return "echo \"$sql\" | $cmnds{mysql} --defaults-file=$defaultsfile"; + return build_exec($sql); } @@ -135,29 +151,24 @@ my $params = shift; my @cmd; - my $bakfile = tmpnam(); + my $bakfile = mktemp("$tmpdir/sqlbakXXXXXX"); my $olddb = $params->{'old_ispmanDBName'}; my $newdb = $params->{'new_ispmanDBName'}; - push @cmd, "$cmnds{mysqldump} --defaults-file=$defaultsfile -r $bakfile $olddb"; - push @cmd, "$cmnds{mysqladmin} --defaults-file=$defaultsfile create $newdb"; - push @cmd, "$cmnds{mysql} --defaults-file=$defaultsfile $newdb < $bakfile"; + push @cmd, "$cmnds{mysqldump} --defaults-file=$mysql_defaults -r $bakfile $olddb"; + push @cmd, "$cmnds{mysqladmin} --defaults-file=$mysql_defaults create $newdb"; + push @cmd, "$cmnds{mysql} --defaults-file=$mysql_defaults $newdb < $bakfile"; # to be uncommented by the brave... - #push @cmd, "$cmnds{mysqladmin} --defaults-file=$defaultsfile -f drop $olddb"; - unlink($bakfile); + push @cmd, "$cmnds{mysqladmin} --defaults-file=$mysql_defaults -f drop $olddb"; # migrate privilege - push @cmd, "echo \"update mysql.db set Db=\'$newdb\' where Db=\'$olddb\' \" | " - . "$cmnds{mysql} --defaults-file=$defaultsfile"; + my $sql = "update mysql.db set Db=\'$newdb\' where Db=\'$olddb\';"; + push @cmd, build_exec($sql); return @cmd; } -END { - unlink($defaultsfile); -} - 1; |
|
From: Joerg D. <jd...@us...> - 2009-02-06 10:13:23
|
Update of /cvsroot/ispman/ispman/lib In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19274/lib Modified Files: database.MySQL.lib Log Message: merged fix from rel_1_4-bugfixes (1.1.2.2) Index: database.MySQL.lib =================================================================== RCS file: /cvsroot/ispman/ispman/lib/database.MySQL.lib,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- database.MySQL.lib 6 Feb 2009 10:09:17 -0000 1.4 +++ database.MySQL.lib 6 Feb 2009 10:13:17 -0000 1.5 @@ -124,7 +124,7 @@ my $sql = "DELETE FROM mysql.user " . "WHERE User=\'" . $params->{'ispmanDBUser'} . "\' " - . "AND Host=\'" . $params->{'ispmanDBAccessFilter'} . "\';" + . "AND Host=\'" . $params->{'ispmanDBAccessFilter'} . "\';"; $sql .= "DROP DATABASE " . $params->{'ispmanDBName'} . ";"; return "echo \"$sql\" | $cmnds{mysql} --defaults-file=$defaultsfile"; |
|
From: Joerg D. <jd...@us...> - 2009-02-06 10:09:23
|
Update of /cvsroot/ispman/ispman/lib In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19045/lib Modified Files: database.MySQL.lib Log Message: added "IF NOT EXISTS" to db creation cmd allow db action script to by fully qualified Index: database.MySQL.lib =================================================================== RCS file: /cvsroot/ispman/ispman/lib/database.MySQL.lib,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- database.MySQL.lib 30 Jan 2009 13:12:25 -0000 1.3 +++ database.MySQL.lib 6 Feb 2009 10:09:17 -0000 1.4 @@ -59,10 +59,11 @@ sub add_database { my $params = shift; - my $sql = "CREATE DATABASE " . $params->{'ispmanDBName'} . ";"; + my $sql = "CREATE DATABASE " . $params->{'ispmanDBName'} . " IF NOT EXISTS;"; $sql .= sql_grant($params); $sql .= "use " . $params->{'ispmanDBName'} . ";"; - $sql .= join ";", map { "\\. ".$ispman->{'Config'}{'installDir'}."/tasks/$_" } split('\|',$params->{'actions'}); + $sql .= join ";", map { "\\. " . ((/^\//)?$_:($ispman->getConf{'installDir'}."/tasks/$_")) } + split('\|',$params->{'actions'}); return "echo \"$sql\" | $cmnds{'mysql'} --defaults-file=$defaultsfile"; } |
|
From: Joerg D. <jd...@us...> - 2009-02-06 10:05:43
|
Update of /cvsroot/ispman/ispman/lib In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18779/lib Modified Files: Tag: rel_1_4-bugfixes database.MySQL.lib Log Message: fixed [ 2571722 ] missing ";" in file lib/database.MySQL.lib in line 125 Index: database.MySQL.lib =================================================================== RCS file: /cvsroot/ispman/ispman/lib/database.MySQL.lib,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- database.MySQL.lib 30 Jan 2009 13:04:28 -0000 1.1.2.1 +++ database.MySQL.lib 6 Feb 2009 10:05:35 -0000 1.1.2.2 @@ -121,7 +121,7 @@ my $sql = "DELETE FROM mysql.user " . "WHERE User=\'" . $params->{'ispmanDBUser'} . "\' " - . "AND Host=\'" . $params->{'ispmanDBAccessFilter'} . "\';" + . "AND Host=\'" . $params->{'ispmanDBAccessFilter'} . "\';"; $sql .= "DROP DATABASE " . $params->{'ispmanDBName'} . ";"; return "echo \"$sql\" | $cmnds{mysql} --defaults-file=$defaultsfile"; |
|
From: Joerg D. <jd...@us...> - 2009-01-30 13:12:34
|
Update of /cvsroot/ispman/ispman/lib/ISPMan In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30979/lib/ISPMan Modified Files: UserMan.pm Log Message: applied fixes from rel_1_4-bugfixes Index: UserMan.pm =================================================================== RCS file: /cvsroot/ispman/ispman/lib/ISPMan/UserMan.pm,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- UserMan.pm 13 Jan 2008 23:05:15 -0000 1.68 +++ UserMan.pm 30 Jan 2009 13:12:25 -0000 1.69 @@ -197,9 +197,10 @@ $domain, $_userInfo->{'mailHost'}, "setMailboxQuota", - "mailbox=" - . $_userInfo->{'mailLocalAddress'} . "&" - . "quota=$quota" + join("&", + "mailhost=" . $_userInfo->{'mailHost'}, + "mailbox=" . $_userInfo->{'mailLocalAddress'}, + "quota=$quota") ); } @@ -444,8 +445,13 @@ unless ( $quota == $userInfo->{'mailQuota'} ) { $data->{'mailQuota'} = $quota; $self->addProcessToHost( - $userInfo->{'ispmanDomain'}, $userInfo->{'mailHost'}, - "setMailboxQuota", "mailbox=$mailbox"a=$quota" + $userInfo->{'ispmanDomain'}, + $userInfo->{'mailHost'}, + "setMailboxQuota", + join("&", + "mailhost=" . $userInfo->{'mailHost'}, + "mailbox=$mailbox", + "quota=$quota") ); } } |
|
From: Joerg D. <jd...@us...> - 2009-01-30 13:12:28
|
Update of /cvsroot/ispman/ispman/lib In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30979/lib Modified Files: database.MySQL.lib Log Message: applied fixes from rel_1_4-bugfixes Index: database.MySQL.lib =================================================================== RCS file: /cvsroot/ispman/ispman/lib/database.MySQL.lib,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- database.MySQL.lib 3 Jan 2009 12:21:05 -0000 1.2 +++ database.MySQL.lib 30 Jan 2009 13:12:25 -0000 1.3 @@ -121,9 +121,9 @@ my $params = shift; my $sql = - "DROP USER " - . sql_user( $params->{'ispmanDBUser'}, $params->{'ispmanDBAccessFilter'} ) - . ";"; + "DELETE FROM mysql.user " + . "WHERE User=\'" . $params->{'ispmanDBUser'} . "\' " + . "AND Host=\'" . $params->{'ispmanDBAccessFilter'} . "\';" $sql .= "DROP DATABASE " . $params->{'ispmanDBName'} . ";"; return "echo \"$sql\" | $cmnds{mysql} --defaults-file=$defaultsfile"; |
|
From: Joerg D. <jd...@us...> - 2009-01-30 13:12:28
|
Update of /cvsroot/ispman/ispman/tasks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30979/tasks Modified Files: setMailboxQuota_task.pl Log Message: applied fixes from rel_1_4-bugfixes Index: setMailboxQuota_task.pl =================================================================== RCS file: /cvsroot/ispman/ispman/tasks/setMailboxQuota_task.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- setMailboxQuota_task.pl 30 Dec 2004 04:15:43 -0000 1.2 +++ setMailboxQuota_task.pl 30 Jan 2009 13:12:25 -0000 1.3 @@ -1,4 +1,4 @@ sub setMailboxQuota_task { my $params=shift; - push @cmd, "perl $FindBin::Bin/ispman.setMailboxQuota -h $hostname $params->{'mailbox'} $params->{'quota'}"; + push @cmd, "perl $FindBin::Bin/ispman.setMailboxQuota -h $params->{'mailhost'} $params->{'mailbox'} $params->{'quota'}"; } |
|
From: Joerg D. <jd...@us...> - 2009-01-30 13:06:29
|
Update of /cvsroot/ispman/ispman/lib/ISPMan In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30581/lib/ISPMan Modified Files: Tag: rel_1_4-bugfixes UserMan.pm Log Message: added parameter mailhost to setMailboxQuota task (necessary for aliased environments) Index: UserMan.pm =================================================================== RCS file: /cvsroot/ispman/ispman/lib/ISPMan/UserMan.pm,v retrieving revision 1.68 retrieving revision 1.68.2.1 diff -u -d -r1.68 -r1.68.2.1 --- UserMan.pm 13 Jan 2008 23:05:15 -0000 1.68 +++ UserMan.pm 30 Jan 2009 13:06:20 -0000 1.68.2.1 @@ -197,9 +197,10 @@ $domain, $_userInfo->{'mailHost'}, "setMailboxQuota", - "mailbox=" - . $_userInfo->{'mailLocalAddress'} . "&" - . "quota=$quota" + join("&", + "mailhost=" . $_userInfo->{'mailHost'}, + "mailbox=" . $_userInfo->{'mailLocalAddress'}, + "quota=$quota") ); } @@ -444,8 +445,13 @@ unless ( $quota == $userInfo->{'mailQuota'} ) { $data->{'mailQuota'} = $quota; $self->addProcessToHost( - $userInfo->{'ispmanDomain'}, $userInfo->{'mailHost'}, - "setMailboxQuota", "mailbox=$mailbox"a=$quota" + $userInfo->{'ispmanDomain'}, + $userInfo->{'mailHost'}, + "setMailboxQuota", + join("&", + "mailhost=" . $userInfo->{'mailHost'}, + "mailbox=$mailbox", + "quota=$quota") ); } } |
|
From: Joerg D. <jd...@us...> - 2009-01-30 13:06:26
|
Update of /cvsroot/ispman/ispman/tasks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30581/tasks Modified Files: Tag: rel_1_4-bugfixes setMailboxQuota_task.pl Log Message: added parameter mailhost to setMailboxQuota task (necessary for aliased environments) Index: setMailboxQuota_task.pl =================================================================== RCS file: /cvsroot/ispman/ispman/tasks/setMailboxQuota_task.pl,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -d -r1.2 -r1.2.6.1 --- setMailboxQuota_task.pl 30 Dec 2004 04:15:43 -0000 1.2 +++ setMailboxQuota_task.pl 30 Jan 2009 13:06:20 -0000 1.2.6.1 @@ -1,4 +1,4 @@ sub setMailboxQuota_task { my $params=shift; - push @cmd, "perl $FindBin::Bin/ispman.setMailboxQuota -h $hostname $params->{'mailbox'} $params->{'quota'}"; + push @cmd, "perl $FindBin::Bin/ispman.setMailboxQuota -h $params->{'mailhost'} $params->{'mailbox'} $params->{'quota'}"; } |
|
From: Joerg D. <jd...@us...> - 2009-01-30 13:04:37
|
Update of /cvsroot/ispman/ispman/lib In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30480/lib Modified Files: Tag: rel_1_4-bugfixes database.MySQL.lib Log Message: replaced DROP USER with DELETE FROM mysql.user to be non -fatal on already deleted users Index: database.MySQL.lib =================================================================== RCS file: /cvsroot/ispman/ispman/lib/database.MySQL.lib,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- database.MySQL.lib 29 Dec 2008 16:21:46 -0000 1.1 +++ database.MySQL.lib 30 Jan 2009 13:04:28 -0000 1.1.2.1 @@ -119,9 +119,9 @@ my $params = shift; my $sql = - "DROP USER " - . sql_user( $params->{'ispmanDBUser'}, $params->{'ispmanDBAccessFilter'} ) - . ";"; + "DELETE FROM mysql.user " + . "WHERE User=\'" . $params->{'ispmanDBUser'} . "\' " + . "AND Host=\'" . $params->{'ispmanDBAccessFilter'} . "\';" $sql .= "DROP DATABASE " . $params->{'ispmanDBName'} . ";"; return "echo \"$sql\" | $cmnds{mysql} --defaults-file=$defaultsfile"; |
|
From: Joerg D. <jd...@us...> - 2009-01-03 20:37:39
|
Update of /cvsroot/ispman/ispman/tasks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28479/tasks Modified Files: execDomainActions_task.pl Log Message: extended script param to be not bound to tasks dir Index: execDomainActions_task.pl =================================================================== RCS file: /cvsroot/ispman/ispman/tasks/execDomainActions_task.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- execDomainActions_task.pl 19 Feb 2007 00:22:10 -0000 1.1 +++ execDomainActions_task.pl 3 Jan 2009 20:37:33 -0000 1.2 @@ -4,10 +4,18 @@ print STDERR "Domain not defined. Cannot continue\n"; return 0; } - unless ( $params->{'script'} ) { + my $script = $params->{'script'}; + unless ( $script ) { print STDERR "script not defined. Cannot continue\n"; return 0; } + unless ($script =~ /^\//) { + $script = $ispman->getConf("installDir")."/tasks/".$script; + } + unless (-x $script) { + print STDERR "Script \"$script\" not executable!"; + return 0; + } - push @cmd, "$FindBin::Bin/../tasks/$params->{'script'} $params->{'domain'}"; + push @cmd, "$script $params->{'domain'}"; } |
|
From: Joerg D. <jd...@us...> - 2009-01-03 20:25:03
|
Update of /cvsroot/ispman/ispman/tasks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26329/tasks Modified Files: execVhostActions_task.pl Log Message: removed obsolete domain param extended script param to be not bound to tasks dir Index: execVhostActions_task.pl =================================================================== RCS file: /cvsroot/ispman/ispman/tasks/execVhostActions_task.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- execVhostActions_task.pl 3 Jan 2009 16:17:25 -0000 1.3 +++ execVhostActions_task.pl 3 Jan 2009 20:24:57 -0000 1.4 @@ -1,17 +1,20 @@ sub execVhostActions_task { my $params = shift; - unless ( $params->{'ispmanDomain'} ) { - print STDERR "ispmanDomain not defined. Cannot continue\n"; - return 0; - } - unless ( $params->{'script'} ) { + my $script = $params->{'script'}; + unless ( $script ) { print STDERR "script not defined. Cannot continue\n"; return 0; } + unless ($script =~ /^\//) { + $script = $ispman->getConf("installDir")."/tasks/".$script; + } + unless (-x $script) { + print STDERR "Script \"$script\" not executable!"; + return 0; + } # Pass script the FQHN of the vhost # (adjust as appropriate) - push @cmd, $ispman->getConf("installDir")."/tasks/".$params->{'script'} - . " " . $params->{'cn'}; + push @cmd, $script." ".$params->{'cn'}; } |
|
From: Joerg D. <jd...@us...> - 2009-01-03 16:17:31
|
Update of /cvsroot/ispman/ispman/tasks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25829/tasks Modified Files: execVhostActions_task.pl Log Message: extended params to execVhostAction script to entire vhost hash Index: execVhostActions_task.pl =================================================================== RCS file: /cvsroot/ispman/ispman/tasks/execVhostActions_task.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- execVhostActions_task.pl 3 Jan 2009 16:02:00 -0000 1.2 +++ execVhostActions_task.pl 3 Jan 2009 16:17:25 -0000 1.3 @@ -10,6 +10,8 @@ return 0; } + # Pass script the FQHN of the vhost + # (adjust as appropriate) push @cmd, $ispman->getConf("installDir")."/tasks/".$params->{'script'} - . " " . $params->{'uidNumber'}; + . " " . $params->{'cn'}; } |
|
From: Joerg D. <jd...@us...> - 2009-01-03 16:17:30
|
Update of /cvsroot/ispman/ispman/lib/ISPMan In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25829/lib/ISPMan Modified Files: ApacheMan.pm Log Message: extended params to execVhostAction script to entire vhost hash Index: ApacheMan.pm =================================================================== RCS file: /cvsroot/ispman/ispman/lib/ISPMan/ApacheMan.pm,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- ApacheMan.pm 21 Dec 2008 13:44:14 -0000 1.80 +++ ApacheMan.pm 3 Jan 2009 16:17:25 -0000 1.81 @@ -418,14 +418,20 @@ ); # add process for vhost actions if ( $r->param("vhostActions") ) { - for ( $r->param("vhostActions") ) { - $self->addVirtualHostDirectoriesProcess( - $r->param("ispmanDomain"), - $r->param("ispmanVhostName"), - "execVhostActions", - "script=$_" . "&uidNumber=" . $vhost_info->{"uidNumber"} - ); - } + for ( $r->param("vhostActions") ) { + $self->addVirtualHostDirectoriesProcess( + $r->param("ispmanDomain"), + $r->param("ispmanVhostName"), + "execVhostActions", + join "&", + "script=$_", + map { + "$_=" . ( ( ref $vhost_info->{$_} eq "ARRAY" ) + ? join( '|', @{ $vhost_info->{$_} } ) + : $vhost_info->{$_} ) + } keys %$vhost_info + ); + } } return 1; } |
|
From: Joerg D. <jd...@us...> - 2009-01-03 16:02:08
|
Update of /cvsroot/ispman/ispman/tasks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23748/tasks Added Files: execVhostActions_task.pl Log Message: added missing task from rel_1_4-bugfixes --- NEW FILE: execVhostActions_task.pl --- sub execVhostActions_task { my $params = shift; unless ( $params->{'ispmanDomain'} ) { print STDERR "ispmanDomain not defined. Cannot continue\n"; return 0; } unless ( $params->{'script'} ) { print STDERR "script not defined. Cannot continue\n"; return 0; } push @cmd, $ispman->getConf("installDir")."/tasks/".$params->{'script'} . " " . $params->{'uidNumber'}; } |
|
From: Joerg D. <jd...@us...> - 2009-01-03 15:57:05
|
Update of /cvsroot/ispman/ispman/tasks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23005/tasks Added Files: Tag: rel_1_4-bugfixes execVhostActions_task.pl Log Message: added missing execVhostAction tasks --- NEW FILE: execVhostActions_task.pl --- sub execVhostActions_task { my $params = shift; unless ( $params->{'ispmanDomain'} ) { print STDERR "ispmanDomain not defined. Cannot continue\n"; return 0; } unless ( $params->{'script'} ) { print STDERR "script not defined. Cannot continue\n"; return 0; } push @cmd, $ispman->getConf("installDir")."/tasks/".$params->{'script'} . " " . $params->{'uidNumber'}; } |
|
From: Joerg D. <jd...@us...> - 2009-01-03 12:55:51
|
Update of /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/databases In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26449/ispman-web/cgi-bin/tmpl/databases Modified Files: add.tmpl Log Message: fix merged from 1.4.2.2 Index: add.tmpl =================================================================== RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/databases/add.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- add.tmpl 3 Jan 2009 12:44:21 -0000 1.7 +++ add.tmpl 3 Jan 2009 12:55:45 -0000 1.8 @@ -86,6 +86,7 @@ <perl> my $out=""; my %acl; + my @sections=(); my $maxrows=0; for (split ",",$ispman->getConf("dbAccessPermissions")) { |
|
From: Joerg D. <jd...@us...> - 2009-01-03 12:54:30
|
Update of /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/databases In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26115/ispman-web/cgi-bin/tmpl/databases Modified Files: Tag: rel_1_4-bugfixes add.tmpl Log Message: fixed missing declaration/scoping of @sections Index: add.tmpl =================================================================== RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/databases/add.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -d -r1.4.2.1 -r1.4.2.2 --- add.tmpl 3 Jan 2009 11:14:07 -0000 1.4.2.1 +++ add.tmpl 3 Jan 2009 12:54:18 -0000 1.4.2.2 @@ -86,6 +86,7 @@ <perl> my $out=""; my %acl; + my @sections=(); my $maxrows=0; for (split ",",$ispman->getConf("dbAccessPermissions")) { |
|
From: Joerg D. <jd...@us...> - 2009-01-03 12:44:27
|
Update of /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/databases In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24166/ispman-web/cgi-bin/tmpl/databases Modified Files: add.tmpl Log Message: cosmetic fixes Index: add.tmpl =================================================================== RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/databases/add.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- add.tmpl 3 Jan 2009 12:21:05 -0000 1.6 +++ add.tmpl 3 Jan 2009 12:44:21 -0000 1.7 @@ -130,7 +130,7 @@ </tr> <tr> - <td>SQL actions</td> + <td>SQL actions:</td> <td> <perl> my @actions=split ',',$ispman->getConf("dbSQLActions"); @@ -153,7 +153,7 @@ </tr> <input type=hidden name="mode" value="add_database_cgi"> -<input type=hidden name="ispmanDomain" value="<perl>$r->param("ispmanDomain")</perl>"> +<input type=hidden name="ispmanDomain" value="<perl>$r->param('ispmanDomain')</perl>"> </form> </table> |
|
From: Joerg D. <jd...@us...> - 2009-01-03 12:44:00
|
Update of /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/databases In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24040/ispman-web/cgi-bin/tmpl/databases Modified Files: edit.tmpl Log Message: fix merged from 1.5.2.1 Index: edit.tmpl =================================================================== RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/databases/edit.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- edit.tmpl 31 Dec 2008 11:37:35 -0000 1.5 +++ edit.tmpl 3 Jan 2009 12:43:55 -0000 1.6 @@ -52,7 +52,7 @@ <table id="ispmanDBPrivilege" width="100%" border="0" cellpadding="2" cellspacing="1"> <perl> my $out=""; - my %acl=; + my %acl; my @sections=(); my $maxrows=0; my $selected = $ispman->as_hashref($dbInfo->{'ispmanDBPrivilege'}); |
|
From: Joerg D. <jd...@us...> - 2009-01-03 12:34:26
|
Update of /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/databases In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22161/ispman-web/cgi-bin/tmpl/databases Modified Files: Tag: rel_1_4-bugfixes edit.tmpl Log Message: fixed syntax error Index: edit.tmpl =================================================================== RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/databases/edit.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- edit.tmpl 31 Dec 2008 11:37:35 -0000 1.5 +++ edit.tmpl 3 Jan 2009 12:34:20 -0000 1.5.2.1 @@ -52,7 +52,7 @@ <table id="ispmanDBPrivilege" width="100%" border="0" cellpadding="2" cellspacing="1"> <perl> my $out=""; - my %acl=; + my %acl; my @sections=(); my $maxrows=0; my $selected = $ispman->as_hashref($dbInfo->{'ispmanDBPrivilege'}); |
|
From: Joerg D. <jd...@us...> - 2009-01-03 12:21:11
|
Update of /cvsroot/ispman/ispman/lib/ISPMan In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19854/lib/ISPMan Modified Files: DBMan.pm Log Message: added database sql action feature Index: DBMan.pm =================================================================== RCS file: /cvsroot/ispman/ispman/lib/ISPMan/DBMan.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- DBMan.pm 31 Dec 2008 17:25:28 -0000 1.8 +++ DBMan.pm 3 Jan 2009 12:21:05 -0000 1.9 @@ -93,8 +93,10 @@ } + my $dbactions = $r->param_fetch("sqlActions"); + # create database - if ( $self->add_database( $domain, $dbhash ) ) { + if ( $self->add_database( $domain, $dbhash, $dbactions ) ) { print $self->refreshSignal($domain); print "Creation of the database ", $dbName, " scheduled."; } @@ -151,6 +153,7 @@ my $self = shift; my $domain = shift; my $dbhash = shift; + my $dbactions = shift; my $dbName = $dbhash->{'ispmanDBName'}; my $server = $dbhash->{'ispmanDBHost'}; @@ -178,7 +181,8 @@ else { if ( $self->addNewEntryWithData( $dn, $dbhash ) ) { $self->addProcessToHost( $domain, $server, "AddDatabase", join "&", - map { "$_=" . ((ref $dbhash->{$_} eq "ARRAY")?join(",",@{$dbhash->{$_}}):$dbhash->{$_}) } keys %$dbhash ); + (map { "$_=" . ((ref $dbhash->{$_} eq "ARRAY")?join(",",@{$dbhash->{$_}}):$dbhash->{$_}) } keys %$dbhash), + "actions=".join "\|",@$dbactions ); return 1; } } |
|
From: Joerg D. <jd...@us...> - 2009-01-03 12:21:11
|
Update of /cvsroot/ispman/ispman/bin In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19854/bin Modified Files: ispman.database Log Message: added database sql action feature Index: ispman.database =================================================================== RCS file: /cvsroot/ispman/ispman/bin/ispman.database,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ispman.database 30 Dec 2008 12:59:49 -0000 1.3 +++ ispman.database 3 Jan 2009 12:21:04 -0000 1.4 @@ -13,9 +13,12 @@ print "Syntax:\n"; print "$FindBin::Script list -d <domain> [-x]\n"; print "$FindBin::Script get -d <domain> -n <dbname> [-x]\n"; - print "$FindBin::Script add -d <domain> -o <dbtype,dbname,dbuser,dbpass,dbfilter,dbpriv|dbpriv,dbhost> [-x]\n"; - print "$FindBin::Script modify -d <domain> -n <dbname> -o <dbtype,dbname,dbuser,dbpass,dbfilter,dbpriv|dbpriv,dbhost> [-x]\n"; - print "$FindBin::Script delete -d <domain> -n <dbname> [-x]\n"; + print "$FindBin::Script add -d <domain> -o <dbtype,dbname,dbuser,dbpass,dbfilter,dbpriv|dbpriv,dbhost> [-a script1.sql|script2.sql]\n"; + print "$FindBin::Script modify -d <domain> -n <dbname> -o <dbtype,dbname,dbuser,dbpass,dbfilter,dbpriv|dbpriv,dbhost>\n"; + print "$FindBin::Script delete -d <domain> -n <dbname>\n"; + print "Options:\n"; + print "-x Output of perl hash as parsable dump\n"; + print "-a Optional SQL action scripts invoked on db creation\n"; print "\n"; exit 1; } @@ -69,7 +72,7 @@ ################################################### # delete if ($action eq "delete") { - getopts( 'd:n:x', \%opts ); + getopts( 'd:n:', \%opts ); usage() unless $opts{'n'} && $opts{'d'}; @@ -79,7 +82,7 @@ ################################################### # add if ($action eq "add") { - getopts( 'd:o:x', \%opts ); + getopts( 'd:o:a:', \%opts ); usage() unless $opts{'d'} && $opts{'o'};; @@ -93,8 +96,10 @@ $dbhash->{$_}=pop @dbdata; } + my @actions = split('\|',$opts{'a'}); + # add database - ($ispman->add_database($opts{'d'},$dbhash))?exit 0:exit 1; + ($ispman->add_database($opts{'d'},$dbhash,\@actions))?exit 0:exit 1; } ################################################### |
|
From: Joerg D. <jd...@us...> - 2009-01-03 12:21:11
|
Update of /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/databases In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19854/ispman-web/cgi-bin/tmpl/databases Modified Files: add.tmpl Log Message: added database sql action feature Index: add.tmpl =================================================================== RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/databases/add.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- add.tmpl 3 Jan 2009 11:19:00 -0000 1.5 +++ add.tmpl 3 Jan 2009 12:21:05 -0000 1.6 @@ -130,6 +130,21 @@ </tr> <tr> + <td>SQL actions</td> + <td> + <perl> + my @actions=split ',',$ispman->getConf("dbSQLActions"); + my $out=""; + for (@actions) { + /(.*)\|(.*)/; + $out .= qq|<input type="checkbox" name="sqlActions" value="$1">$2<br>| unless $1 eq "none"; + } + $out + </perl> + </td> + </tr> + + <tr> <td></td> <td id="buttons" colspan=2> <input type=button class="button" onClick="document.forms[0].reset()" value="Reset"> |
|
From: Joerg D. <jd...@us...> - 2009-01-03 12:21:11
|
Update of /cvsroot/ispman/ispman/docs In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19854/docs Modified Files: ChangeLog Log Message: added database sql action feature Index: ChangeLog =================================================================== RCS file: /cvsroot/ispman/ispman/docs/ChangeLog,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- ChangeLog 1 Jan 2009 15:21:52 -0000 1.42 +++ ChangeLog 3 Jan 2009 12:21:05 -0000 1.43 @@ -1,3 +1,12 @@ +1.5 (unreleased) +================= + + Added SQL Actions to database add form + + Bugs fixed: + [ 2483485 ] Form verification on database add form is broken + + 1.4 (01 Jan 2009) ================= |
31 messages has been excluded from this view by a project administrator.
