mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-21 05:45:13 +00:00
8f4dd6566c
* jammit: Adding new iphone mask image. Moving to proper unicode string for feed fetching. Colorizing feed fetching. Colorizing feed fetching. Adding two error classes to requests exception handling. Adding two error classes to requests exception handling. Adding two error classes to requests exception handling. jQuery 1.6.1 -> 1.7.1. Fixes massive Chrome issues. Adding shift+u as a shortcut for marking a story unread. Adding more advanced exception handling for new requests module, with fallback to urllib2. Adding urllib fallback to requests in page fetching. Adding a little bit more leeway in page importer by falling back to urllib2 when requests fail. Adding slight bit of color to feed fetcher. Revert "Revert "Switching to requests from urllib2/httplib. Bring on the page errors."" Conflicts: assets.yml local_settings.py.template media/js/jquery-1.7.1.js media/js/jquery-1.7.js media/js/vendor/jquery-1.7.js
108 lines
2.3 KiB
Text
108 lines
2.3 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'
|
|
|
|
# =============
|
|
# = 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
|