mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
Updating env vars, attempting to deploy django 1.11.
This commit is contained in:
parent
0b92bca89d
commit
baa4d505a4
12 changed files with 17 additions and 13 deletions
6
fabfile.py
vendored
6
fabfile.py
vendored
|
@ -17,7 +17,7 @@ import time
|
|||
import sys
|
||||
import re
|
||||
|
||||
django.setup()
|
||||
# django.setup()
|
||||
|
||||
try:
|
||||
import digitalocean
|
||||
|
@ -964,6 +964,10 @@ def upgrade_django():
|
|||
pull()
|
||||
sudo('supervisorctl reload')
|
||||
|
||||
def clean():
|
||||
with virtualenv(), settings(warn_only=True):
|
||||
run('find . -name "*.pyc" -exec rm -f {} \;')
|
||||
|
||||
def upgrade_pil():
|
||||
with virtualenv():
|
||||
pull()
|
||||
|
|
|
@ -5,7 +5,7 @@ import shutil
|
|||
CURRENT_DIR = os.path.dirname(__file__)
|
||||
NEWSBLUR_DIR = ''.join([CURRENT_DIR, '/../../'])
|
||||
sys.path.insert(0, NEWSBLUR_DIR)
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
||||
|
||||
import time
|
||||
import s3
|
||||
|
@ -37,4 +37,4 @@ try:
|
|||
except Exception, e:
|
||||
print " ****> Exceptions: %s" % e
|
||||
shutil.rmtree(dir_name)
|
||||
os.remove(filename)
|
||||
os.remove(filename)
|
||||
|
|
|
@ -5,7 +5,7 @@ NEWSBLUR_DIR = '/srv/newsblur'
|
|||
sys.path.insert(0, NEWSBLUR_DIR)
|
||||
VENDOR_DIR = '/srv/newsblur/vendor'
|
||||
sys.path.insert(0, VENDOR_DIR)
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
||||
|
||||
import time
|
||||
import s3
|
||||
|
@ -21,4 +21,4 @@ os.system(cmd)
|
|||
|
||||
print 'Uploading %s to S3...' % filename
|
||||
s3.save_file_in_s3(filename, name="postgres/%s" % filename)
|
||||
os.remove(filename)
|
||||
os.remove(filename)
|
||||
|
|
|
@ -4,7 +4,7 @@ import sys
|
|||
CURRENT_DIR = os.path.dirname(__file__)
|
||||
NEWSBLUR_DIR = ''.join([CURRENT_DIR, '/../../'])
|
||||
sys.path.insert(0, NEWSBLUR_DIR)
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
||||
|
||||
import time
|
||||
import s3
|
||||
|
|
|
@ -4,7 +4,7 @@ import sys
|
|||
CURRENT_DIR = os.path.dirname(__file__)
|
||||
NEWSBLUR_DIR = ''.join([CURRENT_DIR, '/../../'])
|
||||
sys.path.insert(0, NEWSBLUR_DIR)
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
||||
|
||||
import time
|
||||
import s3
|
||||
|
|
|
@ -4,7 +4,7 @@ import sys
|
|||
CURRENT_DIR = os.path.dirname(__file__)
|
||||
NEWSBLUR_DIR = ''.join([CURRENT_DIR, '/../../'])
|
||||
sys.path.insert(0, NEWSBLUR_DIR)
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
||||
|
||||
import time
|
||||
import s3
|
||||
|
|
|
@ -7,7 +7,7 @@ import sys
|
|||
if '/srv/newsblur' not in ' '.join(sys.path):
|
||||
sys.path.append("/srv/newsblur")
|
||||
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
||||
from django.conf import settings
|
||||
|
||||
ACCESS_KEY = settings.S3_ACCESS_KEY
|
||||
|
|
|
@ -5,7 +5,7 @@ from django.conf import settings
|
|||
|
||||
sys.path.append('/srv/newsblur')
|
||||
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
||||
|
||||
if __name__ == '__main__':
|
||||
doapi = digitalocean.Manager(token=settings.DO_TOKEN_LOG)
|
||||
|
|
|
@ -9,7 +9,7 @@ from utils.image_functions import ImageOps
|
|||
if '/srv/newsblur' not in ' '.join(sys.path):
|
||||
sys.path.append("/srv/newsblur")
|
||||
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
||||
from django.conf import settings
|
||||
|
||||
ACCESS_KEY = settings.S3_ACCESS_KEY
|
||||
|
|
|
@ -9,7 +9,7 @@ import sys
|
|||
from requests.exceptions import ConnectionError
|
||||
|
||||
sys.path.insert(0, '/srv/newsblur')
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
||||
import fabfile
|
||||
|
||||
NEWSBLUR_USERNAME = 'sclay'
|
||||
|
|
|
@ -9,7 +9,7 @@ from optparse import OptionParser
|
|||
from requests.exceptions import ConnectionError
|
||||
|
||||
sys.path.insert(0, '/srv/newsblur')
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
||||
import fabfile
|
||||
|
||||
NEWSBLUR_USERNAME = 'sclay'
|
||||
|
|
Loading…
Add table
Reference in a new issue