Skip to content

Commit

Permalink
Small fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@sci2tech
sci2tech committed Jan 22, 2012
1 parent 68665e4 commit b8638ad
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 26 deletions.
32 changes: 22 additions & 10 deletions engine/PerlLib/Servers/httpd/apache_fcgi.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,19 @@ sub enableSite{
use iMSCP::Execute;

my $self = shift;
my $site = shift;
my $sites = shift;
my ($rs, $stdout, $stderr);

$rs = execute("a2ensite $site", \$stdout, \$stderr);
debug("$stdout") if($stdout);
error("$stderr") if($stderr);
return $rs if $rs;
for(split(' ', $sites)){
if(-f "$self::apacheConfig{APACHE_SITES_DIR}/$_"){
$rs = execute("a2ensite $_", \$stdout, \$stderr);
debug("stdout $stdout") if($stdout);
error("stderr $stderr") if($stderr);
return $rs if $rs;
} else {
warning("Site $_ do not exists");
}
}

0;
}
Expand All @@ -174,13 +180,19 @@ sub disableSite{
use iMSCP::Execute;

my $self = shift;
my $site = shift;
my $sites = shift;
my ($rs, $stdout, $stderr);

$rs = execute("a2dissite $site", \$stdout, \$stderr);
debug("stdout $stdout") if($stdout);
error("stderr $stderr") if($stderr);
return $rs if $rs;
for(split(' ', $sites)){
if(-f "$self::apacheConfig{APACHE_SITES_DIR}/$_"){
$rs = execute("a2dissite $_", \$stdout, \$stderr);
debug("stdout $stdout") if($stdout);
error("stderr $stderr") if($stderr);
return $rs if $rs;
} else {
warning("Site $_ do not exists");
}
}

0;
}
Expand Down
2 changes: 1 addition & 1 deletion engine/PerlLib/Servers/httpd/apache_fcgi/installer.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ sub masterHost {
my $httpd = Servers::httpd::apache_fcgi->new();
my $rs = 0;

$rs = $httpd->disableSite('000-default');
$rs = $httpd->disableSite('default');
return $rs if $rs;

my $adminEmailAddress = $main::imscpConfig{'DEFAULT_ADMIN_ADDRESS'};
Expand Down
2 changes: 1 addition & 1 deletion engine/PerlLib/Servers/httpd/apache_fcgi/uninstaller.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ sub vHostConf {
}
}

$rs |= $httpd->enableSite("000-default");
$rs |= $httpd->enableSite("default");

$rs;
}
Expand Down
32 changes: 22 additions & 10 deletions engine/PerlLib/Servers/httpd/apache_itk.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,19 @@ sub enableSite{
use iMSCP::Execute;

my $self = shift;
my $site = shift;
my $sites = shift;
my ($rs, $stdout, $stderr);

$rs = execute("a2ensite $site", \$stdout, \$stderr);
debug("$stdout") if($stdout);
error("$stderr") if($stderr);
return $rs if $rs;
for(split(' ', $sites)){
if(-f "$self::apacheConfig{APACHE_SITES_DIR}/$_"){
$rs = execute("a2ensite $_", \$stdout, \$stderr);
debug("stdout $stdout") if($stdout);
error("stderr $stderr") if($stderr);
return $rs if $rs;
} else {
warning("Site $_ do not exists");
}
}

0;
}
Expand All @@ -174,13 +180,19 @@ sub disableSite{
use iMSCP::Execute;

my $self = shift;
my $site = shift;
my $sites = shift;
my ($rs, $stdout, $stderr);

$rs = execute("a2dissite $site", \$stdout, \$stderr);
debug("stdout $stdout") if($stdout);
error("stderr $stderr") if($stderr);
return $rs if $rs;
for(split(' ', $sites)){
if(-f "$self::apacheConfig{APACHE_SITES_DIR}/$_"){
$rs = execute("a2dissite $_", \$stdout, \$stderr);
debug("stdout $stdout") if($stdout);
error("stderr $stderr") if($stderr);
return $rs if $rs;
} else {
warning("Site $_ do not exists");
}
}

0;
}
Expand Down
2 changes: 1 addition & 1 deletion engine/PerlLib/Servers/httpd/apache_itk/installer.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ sub masterHost {
my $httpd = Servers::httpd::apache_itk->new();
my $rs = 0;

$rs = $httpd->disableSite('000-default');
$rs = $httpd->disableSite('default');
return $rs if $rs;

my $adminEmailAddress = $main::imscpConfig{'DEFAULT_ADMIN_ADDRESS'};
Expand Down
2 changes: 1 addition & 1 deletion engine/PerlLib/Servers/httpd/apache_itk/uninstaller.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ sub vHostConf {
}
}

$rs |= $httpd->enableSite("000-default");
$rs |= $httpd->enableSite("default");

$rs;
}
Expand Down
4 changes: 2 additions & 2 deletions engine/setup/imscp-setup-methods.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ sub setup_engine {
[\&setup_hosts, 'i-MSCP system hosts file: '],
[\&askVHOST, 'i-MSCP virtual hostname'],
[\&setup_resolver, 'i-MSCP system resolver: '],
[\&setup_crontab, 'i-MSCP crontab file: '],
[\&askPHPTimezone, 'PHP timezone: '],
[\&setup_default_sql_data, 'i-MSCP default SQL data: '],
[\&setup_ssl, 'i-MSCP certificate setup: '],
Expand All @@ -71,6 +70,7 @@ sub setup_engine {
[\&installAddons, 'i-MSCP addons install task: '],
[\&postinstallServers, 'i-MSCP server postinstall task: '],
[\&postinstallAddons, 'i-MSCP addons postinstall task: '],
[\&setup_crontab, 'i-MSCP crontab file: '],
[\&setup_imscp_daemon_network, 'i-MSCP init scripts: '],
[\&askBackup, 'Setting backup: '],
[\&rebuild_customers_cfg, 'Rebuilding all customers configuration files: '],
Expand Down Expand Up @@ -728,9 +728,9 @@ sub setup_crontab {
TRAFF_ROOT_DIR => $main::imscpConfig{'TRAFF_ROOT_DIR'},
TOOLS_ROOT_DIR => $main::imscpConfig{'TOOLS_ROOT_DIR'},
BACKUP_ROOT_DIR => $main::imscpConfig{'BACKUP_ROOT_DIR'},
AWSTATS_ROOT_DIR => $main::imscpConfig{'AWSTATS_ROOT_DIR'},
RKHUNTER_LOG => $main::imscpConfig{'RKHUNTER_LOG'},
CHKROOTKIT_LOG => $main::imscpConfig{'CHKROOTKIT_LOG'},
AWSTATS_ROOT_DIR => $main::imscpConfig{'AWSTATS_ROOT_DIR'},
AWSTATS_ENGINE_DIR => $main::imscpConfig{'AWSTATS_ENGINE_DIR'},
'AW-ENABLED' => $awstats,
'RK-ENABLED' => !length($rkhunter) ? '#' : '',
Expand Down

0 comments on commit b8638ad

Please sign in to comment.