diff --git a/app/views/layouts/blacklight.html.erb b/app/views/layouts/blacklight.html.erb
index 8552e15c0a..5f0664981f 100644
--- a/app/views/layouts/blacklight.html.erb
+++ b/app/views/layouts/blacklight.html.erb
@@ -6,7 +6,7 @@
-->
- <% if Rails.env == 'demo' # dont allow search engine indexing if demo site %>
+ <% if ENV["DONT_GOOGLE_INDEX"] # dont allow search engine indexing if demo site %>
<% end %>
diff --git a/config/blacklight.yml b/config/blacklight.yml
index 92896b6e03..de7a3b5591 100644
--- a/config/blacklight.yml
+++ b/config/blacklight.yml
@@ -14,8 +14,5 @@ development:
url: http://127.0.0.1:8983/solr/blacklight-core
test:
url: http://127.0.0.1:8983/solr/blacklight-core
- # TODO: Get separate dev and test cores, and change this back to 8888. bug #1
-demo:
- url: http://127.0.0.1:8983/solr/blacklight-core
production:
url: http://127.0.0.1:8983/solr/blacklight-core
diff --git a/config/database.yml b/config/database.yml
index 607182670c..b041709a5b 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -23,7 +23,3 @@ test:
production:
<<: *default
database: db/production.sqlite3
-
-demo:
- <<: *default
- database: db/production.sqlite3
diff --git a/config/environments/demo.rb b/config/environments/demo.rb
deleted file mode 100644
index 05eeaf09da..0000000000
--- a/config/environments/demo.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-Rails.application.configure do
- # copied from production.rb, we just need to know if this is the demo box, but config is the same
-
- # Settings specified here will take precedence over those in config/application.rb.
-
- # Code is not reloaded between requests.
- config.cache_classes = true
-
- # Eager load code on boot. This eager loads most of Rails and
- # your application in memory, allowing both threaded web servers
- # and those relying on copy on write to perform better.
- # Rake tasks automatically ignore this option for performance.
- config.eager_load = true
-
- # Full error reports are disabled and caching is turned on.
- config.consider_all_requests_local = false
- config.action_controller.perform_caching = true
-
- # Enable Rack::Cache to put a simple HTTP cache in front of your application
- # Add `rack-cache` to your Gemfile before enabling this.
- # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
- # config.action_dispatch.rack_cache = true
-
- # Disable Rails's static asset server (Apache or nginx will already do this).
- # NOT TRUE
- config.serve_static_files = true
-
- # Compress JavaScripts and CSS.
- # config.assets.js_compressor = :uglifier
- config.assets.js_compressor = Uglifier.new(harmony: true)
-
- # config.assets.css_compressor = :sass
-
- # Do not fallback to assets pipeline if a precompiled asset is missed.
- config.assets.compile = false
-
- # Generate digests for assets URLs.
- config.assets.digest = true
-
- # `config.assets.precompile` has moved to config/initializers/assets.rb
-
- # Specifies the header that your server uses for sending files.
- # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
- # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-
- # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
- # config.force_ssl = true
-
- # Set to :debug to see everything in the log.
- config.log_level = :warn
-
- # Prepend all log lines with the following tags.
- # config.log_tags = [ :subdomain, :uuid ]
-
- # Only keep up to 10 log files of ~ 1MB each.
- config.logger = ActiveSupport::Logger.new(File.expand_path('../../../log/production.log', __FILE__), 10, 1.megabytes)
-
- # Use a different cache store in production.
- # config.cache_store = :mem_cache_store
-
- # Enable serving of images, stylesheets, and JavaScripts from an asset server.
- # config.action_controller.asset_host = "http://assets.example.com"
-
- # Precompile additional assets.
- # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
- # config.assets.precompile += %w( search.js )
-
- # Ignore bad email addresses and do not raise email delivery errors.
- # Set this to true and configure the email server for immediate delivery to raise delivery errors.
- # config.action_mailer.raise_delivery_errors = false
-
- # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
- # the I18n.default_locale when a translation cannot be found).
- config.i18n.fallbacks = true
-
- # Send deprecation notices to registered listeners.
- config.active_support.deprecation = :notify
-
- # Disable automatic flushing of the log to improve performance.
- # config.autoflush_log = false
-
- # Use default logging formatter so that PID and timestamp are not suppressed.
- config.log_formatter = ::Logger::Formatter.new
-
- # Do not dump schema after migrations.
- config.active_record.dump_schema_after_migration = false
-
- config.middleware.use('RedirectMiddleware')
-end
diff --git a/config/jetty.yml b/config/jetty.yml
index 489eab1e3c..7e85b3fc24 100644
--- a/config/jetty.yml
+++ b/config/jetty.yml
@@ -5,8 +5,6 @@ default: &default
jetty_port: <%= ENV['JETTY_PORT'] || 8983 %>
jetty_home: <%= ENV['JETTY_HOME'] || File.expand_path(File.join(File.dirname(File.dirname(__FILE__)), 'jetty')) %>
solr_core: <%= ENV['SOLR_CORE'] || 'blacklight-core' %>
-demo:
- <<: *default
development:
<<: *default
test:
diff --git a/lib/tasks/ci_specs.rake b/lib/tasks/ci_specs.rake
index d2a99715c6..4a4648ca97 100644
--- a/lib/tasks/ci_specs.rake
+++ b/lib/tasks/ci_specs.rake
@@ -1,5 +1,5 @@
# Do not build this rake task when in production environment.
-if Rails && !Rails.env.production? && Rails.env != 'demo'
+if Rails && !Rails.env.production?
require 'rspec/core/rake_task'