Skip to content

Commit

Permalink
Force overwrite of solr/conf files if they have changes
Browse files Browse the repository at this point in the history
Blacklight generates Solr configuration into `solr/conf`. Since ActiveFedora now
generates its configurations into the same directory, any differing files will
be treated as conflicts by `Rails::Generators::Base`. Adding `force: true` to
the step that copies these files ensures that the AF versions of these files are
installed without requiring confusing user feedback at generation time.
  • Loading branch information
Tom Johnson committed Aug 19, 2019
1 parent 4fb5c8e commit 405a5ef
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/generators/active_fedora/config/solr/solr_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Config::SolrGenerator < Rails::Generators::Base
def generate
# Overwrite the configuration files that Blacklight has installed
copy_file 'solr.yml', 'config/solr.yml', force: true
directory 'solr', 'solr'
directory 'solr', 'solr', force: true
end

def solr_wrapper_config
Expand Down

0 comments on commit 405a5ef

Please sign in to comment.