Nginx: Update vhosts templates to match BOA improvements #unforkboa

http/Provision/Config/Nginx/Ssl/server_ssl.tpl.php

@@ -4,12 +4,24 @@
 ###  nginx default ssl server
 #######################################################
 
+<?php
+$satellite_mode = drush_get_option('satellite_mode');
+if (!$satellite_mode && $server->satellite_mode) {
+  $satellite_mode = $server->satellite_mode;
+}
+?>
+
 server {
 <?php foreach ($server->ip_addresses as $ip) :?>
   listen       <?php print $ip . ':' . $http_ssl_port; ?>;
 <?php endforeach; ?>
   server_name  _;
   location / {
+<?php if ($satellite_mode == 'boa'): ?>
+    root   /var/www/nginx-default;
+    index  index.html index.htm;
+<?php else: ?>
     return 404;
+<?php endif; ?>
   }
 }

http/Provision/Config/Nginx/Ssl/vhost_ssl_disabled.tpl.php

 
 <?php if ($this->ssl_enabled && $this->ssl_key) : ?>
 
+<?php
+$satellite_mode = drush_get_option('satellite_mode');
+if (!$satellite_mode && $server->satellite_mode) {
+  $satellite_mode = $server->satellite_mode;
+}
+?>
+
 server {
   listen       <?php print "{$ip_address}:{$http_ssl_port}"; ?>;
   server_name  <?php print $this->uri . ' ' . implode(' ', str_replace('/', '.', $this->aliases)); ?>;
+<?php if ($satellite_mode == 'boa'): ?>
+  root         /var/www/nginx-default;
+  index        index.html index.htm;
+<?php else: ?>
+  return       404;
+<?php endif; ?>
   ssl                        on;
   ssl_certificate            <?php print $ssl_cert; ?>;
   ssl_certificate_key        <?php print $ssl_cert_key; ?>;
@@ -11,7 +24,6 @@ server {
   ssl_ciphers                RC4:HIGH:!aNULL:!MD5;
   ssl_prefer_server_ciphers  on;
   keepalive_timeout          70;
-  return                     404;
   ### Do not reveal Aegir front-end URL here.
 }
 

http/Provision/Config/Nginx/subdir_disabled.tpl.php

+<?php
+$satellite_mode = drush_get_option('satellite_mode');
+if (!$satellite_mode && $server->satellite_mode) {
+  $satellite_mode = $server->satellite_mode;
+}
+?>
+
 location ^~ /<?php print $subdir; ?>/ {
-  return       404;
+<?php if ($satellite_mode == 'boa'): ?>
+  root   /var/www/nginx-default;
+  index  index.html index.htm;
+<?php else: ?>
+  return 404;
+<?php endif; ?>
   ### Do not reveal Aegir front-end URL here.
 }

http/Provision/Config/Nginx/vhost_disabled.tpl.php

+<?php
+$satellite_mode = drush_get_option('satellite_mode');
+if (!$satellite_mode && $server->satellite_mode) {
+  $satellite_mode = $server->satellite_mode;
+}
+?>
+
 server {
   listen       *:<?php print $http_port; ?>;
   server_name  <?php print $this->uri . ' ' . implode(' ', str_replace('/', '.', $this->aliases)); ?>;
+<?php if ($satellite_mode == 'boa'): ?>
+  root         /var/www/nginx-default;
+  index        index.html index.htm;
+<?php else: ?>
   return       404;
+<?php endif; ?>
   ### Do not reveal Aegir front-end URL here.
 }