Commit dede611b authored by Grace's avatar Grace

respect http_service_type on hostmaster-migrate

parent 8ead214c
......@@ -12,7 +12,7 @@
###
### deny bots on never cached uri without 403 response
###
location ~* /(user)|(admin) {
location ~* ^/(user)|(admin) {
if ($http_user_agent ~* (crawl|goog|bot) ) {
return 444;
}
......
......@@ -12,7 +12,7 @@
###
### deny bots on never cached uri without 403 response
###
location ~* /(user)|(admin) {
location ~* ^/(user)|(admin) {
if ($http_user_agent ~* (crawl|goog|bot) ) {
return 444;
}
......
......@@ -44,7 +44,7 @@ function drush_provision_hostmaster_install($site = NULL) {
'aegir_root' => $aegir_root,
'script_user' => drush_get_option('script_user', provision_current_user()),
// apache or nginx or..
'http_service_type' => drush_get_option('http_service_type', 'apache', 'options'),
'http_service_type' => drush_get_option('http_service_type', 'apache', 'options'),
'web_group' => drush_get_option('web_group', _provision_default_web_group()),
'master_url' => "http://" . $site . "/",
// mysql
......
......@@ -11,8 +11,8 @@ function drush_provision_hostmaster_migrate_validate($site, $platform) {
'context_type' => 'server',
'aegir_root' => dirname(rtrim($data['config_path'], '/')),
'script_user' => $data['script_user'],
// apache
'http_service_type' => 'apache',
// apache or nginx or..
'http_service_type' => drush_get_option('http_service_type', 'apache', 'options'),
'web_group' => $data['web_group'],
'master_url' => $data['master_url'],
'restart_cmd' => $data['restart_cmd'],
......
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