From 917208812b24cc5a3b62b20a772364762af5fb7c Mon Sep 17 00:00:00 2001 From: did Date: Wed, 6 Apr 2011 11:44:52 +0200 Subject: [PATCH] wrong bushido ENV name + do not ask for subdomain during the installation --- app/views/admin/installation/step_2.html.haml | 2 +- lib/locomotive/hosting/bushido.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/installation/step_2.html.haml b/app/views/admin/installation/step_2.html.haml index 26192eaa..38df7e3d 100644 --- a/app/views/admin/installation/step_2.html.haml +++ b/app/views/admin/installation/step_2.html.haml @@ -14,7 +14,7 @@ = f.inputs do = f.input :name, :required => true - - if manage_subdomain? + - if multi_sites? = f.input :subdomain, :required => true %li{ :class => 'string optional', :id => 'zipfile_input' } diff --git a/lib/locomotive/hosting/bushido.rb b/lib/locomotive/hosting/bushido.rb index ffe9e020..ea492453 100644 --- a/lib/locomotive/hosting/bushido.rb +++ b/lib/locomotive/hosting/bushido.rb @@ -19,7 +19,7 @@ module Locomotive def bushido? self.config.hosting == :bushido || - (self.config.hosting == :auto && ENV['HOSTING_PLATFORM'] == 'bushido') + (self.config.hosting == :auto && ENV['APP_TLD'] == 'bushi.do') end def enable_bushido