diff --git a/config/application.yml.example b/config/application.yml.example index bcd7cb86d..d5277e0c8 100644 --- a/config/application.yml.example +++ b/config/application.yml.example @@ -33,6 +33,16 @@ GROWSTUFF_MAILCHIMP_APIKEY: "" # puts gb.lists.list.to_yaml GROWSTUFF_MAILCHIMP_NEWSLETTER_ID: "" +# Used for connecting member accounts to Twitter +# Get Twitter key from https://dev.twitter.com/apps +GROWSTUFF_TWITTER_KEY: "" +GROWSTUFF_TWITTER_SECRET: "" + +# Used for connecting member accounts to Flickr +# Get Flickr key from http://www.flickr.com/services/apps/create/apply/ +GROWSTUFF_FLICKR_KEY: "" +GROWSTUFF_FLICKR_SECRET: "" + # Paypal is used for payments, obviously. GROWSTUFF_PAYPAL_USERNAME: "dummy" GROWSTUFF_PAYPAL_PASSWORD: "dummy" diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index ad19ed66d..160efb102 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -1,4 +1,4 @@ Rails.application.config.middleware.use OmniAuth::Builder do - provider :twitter, ENV['TWITTER_KEY'], ENV['TWITTER_SECRET'] - provider :flickr, ENV['FLICKR_KEY'], ENV['FLICKR_SECRET'] + provider :twitter, ENV['GROWSTUFF_TWITTER_KEY'], ENV['GROWSTUFF_TWITTER_SECRET'] + provider :flickr, ENV['GROWSTUFF_FLICKR_KEY'], ENV['GROWSTUFF_FLICKR_SECRET'] end diff --git a/credentials.example b/credentials.example index d6c89c18a..48c63b3e5 100755 --- a/credentials.example +++ b/credentials.example @@ -25,13 +25,3 @@ # generate a real secret key with 'rake secret' if you want one (you # don't need to for your dev machine though.) export RAILS_SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" - -# Used for connecting member accounts to Twitter -# Get Twitter key from https://dev.twitter.com/apps -export TWITTER_KEY="" -export TWITTER_SECRET="" - -# Used for connecting member accounts to Flickr -# Get Flickr key from http://www.flickr.com/services/apps/create/apply/ -export FLICKR_KEY="" -export FLICKR_SECRET=""