Revert Demo Env Config, Use Env Var To Control noindex tag (#2906)

WGBH-MLA · Jan 23, 2025 · 127ea03 · 127ea03
1 parent 0d56c62
commit 127ea03
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 100 deletions.
diff --git a/app/views/layouts/blacklight.html.erb b/app/views/layouts/blacklight.html.erb
@@ -6,7 +6,7 @@
 
   -->
   <head>
-    <% 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 %>
       <meta name="robots" content="noindex">
     <% end %>
 

diff --git 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
@@ -23,7 +23,3 @@ test:
 production:
   <<: *default
   database: db/production.sqlite3
-
-demo:
-  <<: *default
-  database: db/demo.sqlite3
diff --git a/config/environments/demo.rb b/config/environments/demo.rb
diff --git 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
@@ -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'