Skip to content

Commit

Permalink
Saving changes before migrating computers
Browse files Browse the repository at this point in the history
  • Loading branch information
louispt1 authored and noracato committed Nov 12, 2024
1 parent 7ba8c2b commit 47ca093
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 16 deletions.
9 changes: 0 additions & 9 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,5 @@ def render_not_found(thing = nil)
)

true

# Returns the Faraday client which should be used to communicate with ETEngine. This contains the
# user authentication token if the user is logged in.
# def engine_client
# if current_user
# identity_session.access_token.http_client
# else
# Identity.http_client
# end
end
end
10 changes: 5 additions & 5 deletions config/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ etsource_lazy_load_dataset: true
# http://beta.et-model.com/pages/refresh_gqueries
client_refresh_url:

# TODO: Fix this config
# TODO: Fix this to fetch from ENV
etmodel:
uri: localhost:3001
uri: http://localhost:3001
etengine:
uri: localhost:3000
uri: http://localhost:3000
collections:
uri: localhost:3005
uri: http://localhost:3005
myetm:
iss: my-etm
uri: localhost:3002
uri: http://localhost:3002


# set to true if the server won't have online access. this disables Sentry,
Expand Down
5 changes: 3 additions & 2 deletions lib/myetm/staff_applications.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def etengine
run_command: 'bundle exec rails server -p %<port>s',
config_path: 'config/settings.local.yml',
config_content: <<~YAML,
api_url: %<myetm_url>s
idp_url: %<myetm_url>s
identity:
client_id: %<uid>s
Expand All @@ -54,7 +54,8 @@ def etmodel
run_command: 'bundle exec rails server -p %<port>s',
config_path: 'config/settings.local.yml',
config_content: <<~YAML,
api_url: %<myetm_url>s
idp_url: %<myetm_url>s
ete_url: %<etengine_url>s
identity:
client_id: %<uid>s
Expand Down

0 comments on commit 47ca093

Please sign in to comment.