maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

cron/apache

Browse Source 
- fix mixed indentation
- fix trailing whitespace (code+resulting vhost config)
This commit is contained in:
Daniel Reichelt
2016-02-22 15:31:23 +01:00
parent 36cf003ed6
commit 82b43948b4
1 changed files with 51 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -827,9 +827,7 @@ class apache extends HttpConfigBase {
$vhost_content .= '"' . "\n"; $vhost_content .= '"' . "\n";
$vhost_content .= ' </IfModule>' . "\n"; $vhost_content .= ' </IfModule>' . "\n";
} }
} } else {
else
{
// if there is no cert-file specified but we are generating a ssl-vhost, // if there is no cert-file specified but we are generating a ssl-vhost,
// we should return an empty string because this vhost would suck dick, ref #1583 // we should return an empty string because this vhost would suck dick, ref #1583
$this->logger->logAction(CRON_ACTION, LOG_ERR, $domain['domain'] . ' :: empty certificate file! Cannot create ssl-directives'); $this->logger->logAction(CRON_ACTION, LOG_ERR, $domain['domain'] . ' :: empty certificate file! Cannot create ssl-directives');
@@ -844,7 +842,7 @@ class apache extends HttpConfigBase {
$code = getDomainRedirectCode($domain['id']); $code = getDomainRedirectCode($domain['id']);
$modrew_red = ''; $modrew_red = '';
if ($code != '') { if ($code != '') {
$modrew_red = '[R='. $code . ';L,NE]'; $modrew_red = ' [R='. $code . ';L,NE]';
} }
// redirect everything, not only root-directory, #541 // redirect everything, not only root-directory, #541
@@ -853,7 +851,7 @@ class apache extends HttpConfigBase {
if (!$ssl_vhost) { if (!$ssl_vhost) {
$vhost_content .= ' RewriteCond %{HTTPS} off' . "\n"; $vhost_content .= ' RewriteCond %{HTTPS} off' . "\n";
} }
$vhost_content .= ' RewriteRule ^/(.*) '. $corrected_docroot.'$1 ' . $modrew_red . "\n"; $vhost_content .= ' RewriteRule ^/(.*) '. $corrected_docroot.'$1' . $modrew_red . "\n";
$vhost_content .= ' </IfModule>' . "\n"; $vhost_content .= ' </IfModule>' . "\n";
$vhost_content .= ' Redirect '.$code.' / ' . $this->idnaConvert->encode($domain['documentroot']) . "\n"; $vhost_content .= ' Redirect '.$code.' / ' . $this->idnaConvert->encode($domain['documentroot']) . "\n";