Enable valkyrie and disable noid in new application config

lib/generators/hyrax/templates/.env

@@ -3,8 +3,6 @@ DATABASE_URL=postgresql://postgres@localhost:5437/hyrax-dev?pool=5
 FCREPO_URL=http://fedoraAdmin:fedoraAdmin@fcrepo:8989/fcrepo/rest
 FITS_SERVLET_URL=http://localhost:8085/fits
 HYRAX_ACTIVE_JOB_QUEUE=async
-HYRAX_SKIP_WINGS=true
-HYRAX_VALKYRIE=true
 REDIS_URL=redis://localhost:6384
 SOLR_URL=http://localhost:8988/solr/hyrax-dev
 VALKYRIE_METADATA_ADAPTER=pg_metadata

lib/generators/hyrax/templates/config/initializers/hyrax.rb

@@ -59,7 +59,7 @@
 
   # Hyrax uses NOIDs for files and collections instead of Fedora UUIDs
   # where NOID = 10-character string and UUID = 32-character string w/ hyphens
-  # config.enable_noids = true
+  config.enable_noids = false
 
   # Template for your repository's NOID IDs
   # config.noid_template = ".reeddeeddk"
@@ -274,6 +274,10 @@
   #   Hyrax::Indexers::PcdmObjectIndexer(model_class)
   # end
 
+  ## Enable Valkyrie only mode
+  config.use_valkyrie = true
+  config.disable_wings true
+
   # When your application is ready to use the valkyrie index instead of the one
   # maintained by active fedora, you will need to set this to true. You will
   # also need to update your Blacklight configuration.