Commit 4d9b5ee6 authored by omega8cc's avatar omega8cc

We no longer need the $nginx_has_new_version variable.

Signed-off-by: omega8cc's avatarBarracuda Team <admin@omega8.cc>
parent a88acd87
......@@ -16,7 +16,6 @@ class provisionService_http_nginx extends provisionService_http_public {
$this->configs['server'][] = 'provisionConfig_nginx_server';
$this->configs['site'][] = 'provisionConfig_nginx_site';
$this->server->setProperty('nginx_has_gzip', 0);
$this->server->setProperty('nginx_has_new_version', 0);
$this->server->setProperty('nginx_web_server', 0);
$this->server->setProperty('nginx_has_upload_progress', 0);
}
......
......@@ -20,7 +20,6 @@ server {
root <?php print "{$this->root}"; ?>;
<?php print $extra_config; ?>
<?php
$nginx_has_new_version = drush_get_option('nginx_has_new_version');
$nginx_has_upload_progress = drush_get_option('nginx_has_upload_progress');
if ($this->redirection || $ssl_redirection) {
if ($ssl_redirection && !$this->redirection) {
......@@ -32,7 +31,7 @@ if ($this->redirection || $ssl_redirection) {
print "\n rewrite ^ https://{$this->uri}\$request_uri? permanent;\n";
}
elseif (!$ssl_redirection && $this->redirection) {
if ($server->nginx_has_new_version || $server->nginx_has_upload_progress) {
if ($server->nginx_has_upload_progress) {
print " include " . $server->include_path . "/nginx_advanced_include.conf;\n";
}
else {
......@@ -41,7 +40,7 @@ if ($this->redirection || $ssl_redirection) {
}
}
else {
if ($server->nginx_has_new_version || $server->nginx_has_upload_progress) {
if ($server->nginx_has_upload_progress) {
print " include " . $server->include_path . "/nginx_advanced_include.conf;\n";
}
else {
......
......@@ -45,7 +45,6 @@ class provisionService_http_nginx_ssl extends provisionService_http_ssl {
$this->configs['server'][] = 'provisionConfig_nginx_ssl_server';
$this->configs['site'][] = 'provisionConfig_nginx_ssl_site';
$this->server->setProperty('nginx_has_gzip', 0);
$this->server->setProperty('nginx_has_new_version', 0);
$this->server->setProperty('nginx_web_server', 0);
$this->server->setProperty('nginx_has_upload_progress', 0);
}
......
......@@ -33,9 +33,8 @@ server {
keepalive_timeout 70;
<?php print $extra_config; ?>
<?php
$nginx_has_new_version = drush_get_option('nginx_has_new_version');
$nginx_has_upload_progress = drush_get_option('nginx_has_upload_progress');
if ($nginx_has_new_version || $nginx_has_upload_progress) {
if ($nginx_has_upload_progress) {
print " include " . $server->include_path . "/nginx_advanced_include.conf;\n";
}
else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment