Skip to content

Commit

Permalink
Merge pull request #474 from sul-dlss/config
Browse files Browse the repository at this point in the history
Don't configure SSL on development
  • Loading branch information
jmartin-sul committed Oct 23, 2019
2 parents cc8b1ff + 83ea752 commit 816e347
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
4 changes: 3 additions & 1 deletion config/initializers/dor_config.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# frozen_string_literal: true

Dor.configure do
# rubocop:disable Style/MultilineIfModifier
ssl do
cert_file Settings.ssl.cert_file
key_file Settings.ssl.key_file
key_pass Settings.ssl.key_pass
end
end if Settings.ssl
# rubocop:enable Style/MultilineIfModifier

fedora do
url Settings.fedora_url
Expand Down
6 changes: 0 additions & 6 deletions config/settings.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
# SSL
ssl:
cert_file: "/etc/pki/tls/certs/<%= (`echo $HOSTNAME`).strip.gsub('.stanford.edu', '') %>-dor-prod.crt"
key_file: "/etc/pki/tls/private/<%= (`echo $HOSTNAME`).strip.gsub('.stanford.edu', '') %>-dor-prod.key"
key_pass: 'password'

content:
base_dir: '/dor/workspace'

Expand Down
1 change: 1 addition & 0 deletions config/settings/development.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fedora_url: 'http://fedoraAdmin:fedoraAdmin@localhost:8983/fedora'

0 comments on commit 816e347

Please sign in to comment.