wrong bushido ENV name + do not ask for subdomain during the installation

2011-04-06 11:44:52 +02:00 · 2011-04-06 11:44:52 +02:00 · 917208812b
commit 917208812b
parent 2cba14afec
2 changed files with 2 additions and 2 deletions
--- 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' }
--- 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