Prepping for open-source launch.
parent
d753e900da
commit
dc21403b30
|
@ -5,5 +5,7 @@
|
||||||
*.pgdump
|
*.pgdump
|
||||||
*.pyc
|
*.pyc
|
||||||
|
|
||||||
|
local_settings.py
|
||||||
media/cache
|
media/cache
|
||||||
static
|
static
|
||||||
|
tags
|
||||||
|
|
|
@ -5,8 +5,10 @@ from boto.s3.key import Key
|
||||||
|
|
||||||
import datetime, sys
|
import datetime, sys
|
||||||
|
|
||||||
|
from local_settings import AMAZON_API_KEY, AMAZON_API_SECRET, ENV_HOST
|
||||||
|
|
||||||
env.hosts = ['nick@snipt.net:39039']
|
|
||||||
|
env.hosts = [ENV_HOST]
|
||||||
env.site_path = '/var/www/snipt'
|
env.site_path = '/var/www/snipt'
|
||||||
env.venv_path = '/home/nick/.virtualenvs/snipt'
|
env.venv_path = '/home/nick/.virtualenvs/snipt'
|
||||||
|
|
||||||
|
@ -88,7 +90,7 @@ def db_backup():
|
||||||
|
|
||||||
local('pg_dump snipt > {}'.format(filename))
|
local('pg_dump snipt > {}'.format(filename))
|
||||||
|
|
||||||
conn = S3Connection('AKIAJJRRQPTSPKB7GYOA', 'DIYz2g5vPjcWE4/YI7wEuUVAskwJxs2llFvGyI1a')
|
conn = S3Connection(AMAZON_API_KEY, AMAZON_API_SECRET)
|
||||||
snipt_bucket = conn.get_bucket('snipt')
|
snipt_bucket = conn.get_bucket('snipt')
|
||||||
|
|
||||||
k = Key(snipt_bucket)
|
k = Key(snipt_bucket)
|
||||||
|
|
32
settings.py
32
settings.py
|
@ -1,4 +1,4 @@
|
||||||
# Django settings for sidepros project.
|
# Django settings for snipt project.
|
||||||
|
|
||||||
import os, socket
|
import os, socket
|
||||||
|
|
||||||
|
@ -6,29 +6,23 @@ if socket.gethostname() in ['air.local', 'pro.local']:
|
||||||
DEBUG = True
|
DEBUG = True
|
||||||
else:
|
else:
|
||||||
DEBUG = False
|
DEBUG = False
|
||||||
|
|
||||||
TEMPLATE_DEBUG = DEBUG
|
TEMPLATE_DEBUG = DEBUG
|
||||||
BASE_PATH = os.path.dirname(__file__)
|
BASE_PATH = os.path.dirname(__file__)
|
||||||
|
|
||||||
ADMINS = (
|
ADMINS = (
|
||||||
('Nick Sergeant', 'nick@snipt.net'),
|
('Name', 'name@domain.com'),
|
||||||
)
|
)
|
||||||
MANAGERS = ADMINS
|
MANAGERS = ADMINS
|
||||||
|
|
||||||
INTERNAL_IPS = ('127.0.0.1',)
|
INTERNAL_IPS = ('127.0.0.1',)
|
||||||
|
|
||||||
if DEBUG:
|
|
||||||
DB_USER = 'Nick'
|
|
||||||
DB_PASSWORD = ''
|
|
||||||
else:
|
|
||||||
DB_USER = 'nick'
|
|
||||||
DB_PASSWORD = 'zmDLn0nTi3No8lUiADb4BNFA'
|
|
||||||
|
|
||||||
DATABASES = {
|
DATABASES = {
|
||||||
'default': {
|
'default': {
|
||||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
||||||
'NAME': 'snipt',
|
'NAME': '',
|
||||||
'USER': DB_USER,
|
'USER': '',
|
||||||
'PASSWORD': DB_PASSWORD,
|
'PASSWORD': '',
|
||||||
'HOST': 'localhost',
|
'HOST': 'localhost',
|
||||||
'PORT': '',
|
'PORT': '',
|
||||||
}
|
}
|
||||||
|
@ -89,7 +83,7 @@ STATICFILES_FINDERS = (
|
||||||
)
|
)
|
||||||
|
|
||||||
# Make this unique, and don't share it with anybody.
|
# Make this unique, and don't share it with anybody.
|
||||||
SECRET_KEY = 'afk&6t4l#x+9hhhpl2&3zm&me06fcu&v3*j54kxitbe8kg-19)'
|
SECRET_KEY = ''
|
||||||
|
|
||||||
# List of callables that know how to import templates from various sources.
|
# List of callables that know how to import templates from various sources.
|
||||||
TEMPLATE_LOADERS = (
|
TEMPLATE_LOADERS = (
|
||||||
|
@ -180,13 +174,10 @@ LOGGING = {
|
||||||
DEFAULT_FROM_EMAIL = 'support@snipt.net'
|
DEFAULT_FROM_EMAIL = 'support@snipt.net'
|
||||||
SERVER_EMAIL = 'support@snipt.net'
|
SERVER_EMAIL = 'support@snipt.net'
|
||||||
EMAIL_BACKEND = 'postmark.django_backend.EmailBackend'
|
EMAIL_BACKEND = 'postmark.django_backend.EmailBackend'
|
||||||
POSTMARK_API_KEY = '608d3101-1706-4a96-819f-f2f36fe00fe0'
|
POSTMARK_API_KEY = ''
|
||||||
|
|
||||||
# Virtualenv
|
# Virtualenv
|
||||||
if DEBUG:
|
VIRTUALENV_PATH = ''
|
||||||
VIRTUALENV_PATH = '/Users/Nick/.virtualenvs/snipt/lib/python2.7/site-packages/'
|
|
||||||
else:
|
|
||||||
VIRTUALENV_PATH = '/home/nick/.virtualenvs/snipt/lib/python2.7/site-packages/'
|
|
||||||
|
|
||||||
# Account settings
|
# Account settings
|
||||||
LOGIN_REDIRECT_URL = '/'
|
LOGIN_REDIRECT_URL = '/'
|
||||||
|
@ -234,3 +225,8 @@ TASTYPIE_CANNED_ERROR = "There was an error with your request. The site develope
|
||||||
# Extensions
|
# Extensions
|
||||||
if DEBUG:
|
if DEBUG:
|
||||||
INSTALLED_APPS += ('django_extensions',)
|
INSTALLED_APPS += ('django_extensions',)
|
||||||
|
|
||||||
|
try:
|
||||||
|
from local_settings import *
|
||||||
|
except ImportError:
|
||||||
|
pass
|
||||||
|
|
6
views.py
6
views.py
|
@ -15,13 +15,15 @@ import os, urllib
|
||||||
|
|
||||||
import stripe
|
import stripe
|
||||||
|
|
||||||
|
from local_settings import AMAZON_API_KEY, AMAZON_API_SECRET, STRIPE_API_KEY
|
||||||
|
|
||||||
|
|
||||||
@ajax_request
|
@ajax_request
|
||||||
def amazon_search(request):
|
def amazon_search(request):
|
||||||
|
|
||||||
products = []
|
products = []
|
||||||
if request.GET.get('q'):
|
if request.GET.get('q'):
|
||||||
amazon = AmazonAPI('AKIAJJRRQPTSPKB7GYOA', 'DIYz2g5vPjcWE4/YI7wEuUVAskwJxs2llFvGyI1a', 'snipt-20')
|
amazon = AmazonAPI(AMAZON_API_KEY, AMAZON_API_SECRET, 'snipt-20')
|
||||||
products = amazon.search_n(5, Keywords=request.GET.get('q'), SearchIndex='Books')
|
products = amazon.search_n(5, Keywords=request.GET.get('q'), SearchIndex='Books')
|
||||||
|
|
||||||
result = []
|
result = []
|
||||||
|
@ -105,7 +107,7 @@ def pro_signup_complete(request):
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
|
|
||||||
token = request.POST['token']
|
token = request.POST['token']
|
||||||
stripe.api_key = '5XchbRsWVbksTRWSX67kOdBnCf01DxSh'
|
stripe.api_key = STRIPE_API_KEY
|
||||||
|
|
||||||
plan = 'snipt-pro'
|
plan = 'snipt-pro'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue