mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-05 16:58:59 +00:00
aaa5aa1cd6
* master: Changing copy on premium/feedchooser dialog. Styling errors on stripe payment form. Final stripe.js tweaks before launch. Adding Pay by Credit Card as an option to feed chooser dialog. Thus concludes Stripe.js integration. Time to launch! Styling the stripe.js background. Using correct kwargs for stripe signal. Wrapping up stripe.js form. Has validation, styling, and does the right thing for new subscriptions. Needs a link to the form, though. Setting up correct customer model for stripe webhook. Moving JS assets to bottom of the page for faster loadtimes. Fixing exception on missing param in feed address searching. Fixing recommendation date serialization bug. Fixing bugs around login with blank password using full password. Also fixing bug in signups with no username. Stripe.js payments using zebra. Adding zebra as a vendored dependency. Webhooks and views all in. Needs styling, custom username and email fields, and loads of testing. Adding error checking on requests in page fetching. Using a probability from redis to determine whether or not to skip a fetch. Allowing any password to be used on accounts with no password set. Adding paypal logo. Conflicts: assets.yml media/js/newsblur/reader/reader_feedchooser.js settings.py templates/base.html
111 lines
2.4 KiB
Text
111 lines
2.4 KiB
Text
import logging
|
|
import pymongo
|
|
|
|
# ===================
|
|
# = Server Settings =
|
|
# ===================
|
|
|
|
ADMINS = (
|
|
('Samuel Clay', 'samuel@ofbrooklyn.com'),
|
|
)
|
|
|
|
SERVER_EMAIL = 'server@newsblur.com'
|
|
HELLO_EMAIL = 'hello@newsblur.com'
|
|
NEWSBLUR_URL = 'http://www.newsblur.com'
|
|
|
|
# ==================
|
|
# = Global Settngs =
|
|
# ==================
|
|
|
|
DEBUG = True
|
|
MEDIA_URL = '/media/'
|
|
SECRET_KEY = 'YOUR SECRET KEY'
|
|
|
|
CACHE_BACKEND = 'dummy:///'
|
|
# CACHE_BACKEND = 'locmem:///'
|
|
# CACHE_BACKEND = 'memcached://127.0.0.1:11211'
|
|
|
|
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
|
|
|
|
# Set this to the username that is shown on the homepage to unauthenticated users.
|
|
HOMEPAGE_USERNAME = 'conesus'
|
|
|
|
# Google Reader OAuth API Keys
|
|
OAUTH_KEY = 'www.example.com'
|
|
OAUTH_SECRET = 'SECRET_KEY_FROM_GOOGLE'
|
|
|
|
S3_ACCESS_KEY = 'XXX'
|
|
S3_SECRET = 'SECRET'
|
|
S3_BACKUP_BUCKET = 'newsblur_backups'
|
|
|
|
STRIPE_SECRET = "YOUR-SECRET-API-KEY"
|
|
STRIPE_PUBLISHABLE = "YOUR-PUBLISHABLE-API-KEY"
|
|
|
|
# =============
|
|
# = Databases =
|
|
# =============
|
|
|
|
DATABASES = {
|
|
'default': {
|
|
'NAME': 'newsblur',
|
|
'ENGINE': 'django.db.backends.mysql',
|
|
'USER': 'newsblur',
|
|
'PASSWORD': '',
|
|
'HOST': '127.0.0.1',
|
|
},
|
|
}
|
|
|
|
MONGO_DB = {
|
|
'name': 'newsblur',
|
|
'host': '127.0.0.1',
|
|
'port': 27017
|
|
}
|
|
|
|
MONGODB_SLAVE = {
|
|
'host': '127.0.0.1'
|
|
}
|
|
|
|
# Celery RabbitMQ Broker
|
|
BROKER_HOST = "127.0.0.1"
|
|
|
|
REDIS = {
|
|
'host': '127.0.0.1',
|
|
}
|
|
|
|
# AMQP - RabbitMQ server
|
|
BROKER_HOST = "db01.newsblur.com"
|
|
BROKER_PORT = 5672
|
|
BROKER_USER = "newsblur"
|
|
BROKER_PASSWORD = "newsblur"
|
|
BROKER_VHOST = "newsblurvhost"
|
|
|
|
|
|
# ===========
|
|
# = Logging =
|
|
# ===========
|
|
|
|
# Logging (setup for development)
|
|
LOG_TO_STREAM = True
|
|
|
|
if len(logging._handlerList) < 1:
|
|
LOG_FILE = '~/newsblur/logs/development.log'
|
|
logging.basicConfig(level=logging.DEBUG,
|
|
format='%(asctime)-12s: %(message)s',
|
|
datefmt='%b %d %H:%M:%S',
|
|
handler=logging.StreamHandler)
|
|
<<<<<<< HEAD
|
|
|
|
S3_ACCESS_KEY = 'XXX'
|
|
S3_SECRET = 'SECRET'
|
|
S3_BACKUP_BUCKET = 'newsblur_backups'
|
|
|
|
# ===============
|
|
# = Social APIs =
|
|
# ===============
|
|
|
|
FACEBOOK_APP_ID = '111111111111111'
|
|
FACEBOOK_SECRET = '99999999999999999999999999999999'
|
|
TWITTER_CONSUMER_KEY = 'ooooooooooooooooooooo'
|
|
TWITTER_CONSUMER_SECRET = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
|
|
=======
|
|
>>>>>>> jammit
|