Skip to content
This repository has been archived by the owner on Mar 15, 2018. It is now read-only.

setup default oauth between zamboni and solitude (bug 1106198) #2760

Merged
merged 1 commit into from
Dec 12, 2014
Merged

setup default oauth between zamboni and solitude (bug 1106198) #2760

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mkt/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,14 +1106,14 @@ def JINJA_CONFIG():
SOLITUDE_HOSTS = (os.environ.get('SOLITUDE_URL', 'http://localhost:2602'),)

# The oAuth key and secret that solitude needs.
SOLITUDE_KEY = ''
SOLITUDE_SECRET = ''
SOLITUDE_KEY = 'marketplace'
SOLITUDE_SECRET = 'please change this'

# The timeout we'll give solitude.
SOLITUDE_TIMEOUT = 10

# The OAuth keys to connect to the solitude host specified above.
SOLITUDE_OAUTH = {'key': '', 'secret': ''}
SOLITUDE_OAUTH = {'key': SOLITUDE_KEY, 'secret': SOLITUDE_SECRET}

# Full path or executable path (relative to $PATH) of the spidermonkey js
# binary. It must be a version compatible with amo-validator
Expand Down