mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-05 16:58:59 +00:00
update newsblur dir to newsblur_web in code
This commit is contained in:
parent
dab9fc957f
commit
934550fde7
27 changed files with 27 additions and 27 deletions
|
@ -1,4 +1,4 @@
|
||||||
from newsblur.celeryapp import app
|
from newsblur_web.celeryapp import app
|
||||||
from utils import log as logging
|
from utils import log as logging
|
||||||
|
|
||||||
@app.task()
|
@app.task()
|
||||||
|
|
2
fabfile.py
vendored
2
fabfile.py
vendored
|
@ -25,7 +25,7 @@ except ImportError:
|
||||||
print("Digital Ocean's API not loaded. Install python-digitalocean.")
|
print("Digital Ocean's API not loaded. Install python-digitalocean.")
|
||||||
|
|
||||||
|
|
||||||
django.settings_module('newsblur.settings')
|
django.settings_module('newsblur_web.settings')
|
||||||
try:
|
try:
|
||||||
from django.conf import settings as django_settings
|
from django.conf import settings as django_settings
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
|
|
@ -103,7 +103,7 @@ def db_check_redis_story():
|
||||||
abort(404)
|
abort(404)
|
||||||
|
|
||||||
@app.route("/db_check/redis_pubsub")
|
@app.route("/db_check/redis_pubsub")
|
||||||
def db_check_redis_story():
|
def db_check_redis_pubsub():
|
||||||
redis_host = getattr(settings, 'REDIS', {'host': 'db_redis_pubsub'})
|
redis_host = getattr(settings, 'REDIS', {'host': 'db_redis_pubsub'})
|
||||||
try:
|
try:
|
||||||
r = redis.Redis(redis_host['host'], db=1)
|
r = redis.Redis(redis_host['host'], db=1)
|
||||||
|
|
|
@ -5,7 +5,7 @@ import shutil
|
||||||
CURRENT_DIR = os.path.dirname(__file__)
|
CURRENT_DIR = os.path.dirname(__file__)
|
||||||
NEWSBLUR_DIR = ''.join([CURRENT_DIR, '/../../'])
|
NEWSBLUR_DIR = ''.join([CURRENT_DIR, '/../../'])
|
||||||
sys.path.insert(0, NEWSBLUR_DIR)
|
sys.path.insert(0, NEWSBLUR_DIR)
|
||||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings'
|
||||||
|
|
||||||
import time
|
import time
|
||||||
import s3
|
import s3
|
||||||
|
|
|
@ -5,7 +5,7 @@ NEWSBLUR_DIR = '/srv/newsblur'
|
||||||
sys.path.insert(0, NEWSBLUR_DIR)
|
sys.path.insert(0, NEWSBLUR_DIR)
|
||||||
VENDOR_DIR = '/srv/newsblur/vendor'
|
VENDOR_DIR = '/srv/newsblur/vendor'
|
||||||
sys.path.insert(0, VENDOR_DIR)
|
sys.path.insert(0, VENDOR_DIR)
|
||||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings'
|
||||||
|
|
||||||
import time
|
import time
|
||||||
import s3
|
import s3
|
||||||
|
|
|
@ -4,7 +4,7 @@ import sys
|
||||||
CURRENT_DIR = os.path.dirname(__file__)
|
CURRENT_DIR = os.path.dirname(__file__)
|
||||||
NEWSBLUR_DIR = ''.join([CURRENT_DIR, '/../../'])
|
NEWSBLUR_DIR = ''.join([CURRENT_DIR, '/../../'])
|
||||||
sys.path.insert(0, NEWSBLUR_DIR)
|
sys.path.insert(0, NEWSBLUR_DIR)
|
||||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings'
|
||||||
|
|
||||||
import time
|
import time
|
||||||
import s3
|
import s3
|
||||||
|
|
|
@ -4,7 +4,7 @@ import sys
|
||||||
CURRENT_DIR = os.path.dirname(__file__)
|
CURRENT_DIR = os.path.dirname(__file__)
|
||||||
NEWSBLUR_DIR = ''.join([CURRENT_DIR, '/../../'])
|
NEWSBLUR_DIR = ''.join([CURRENT_DIR, '/../../'])
|
||||||
sys.path.insert(0, NEWSBLUR_DIR)
|
sys.path.insert(0, NEWSBLUR_DIR)
|
||||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings'
|
||||||
|
|
||||||
import time
|
import time
|
||||||
import s3
|
import s3
|
||||||
|
|
|
@ -4,7 +4,7 @@ import sys
|
||||||
CURRENT_DIR = os.path.dirname(__file__)
|
CURRENT_DIR = os.path.dirname(__file__)
|
||||||
NEWSBLUR_DIR = ''.join([CURRENT_DIR, '/../../'])
|
NEWSBLUR_DIR = ''.join([CURRENT_DIR, '/../../'])
|
||||||
sys.path.insert(0, NEWSBLUR_DIR)
|
sys.path.insert(0, NEWSBLUR_DIR)
|
||||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings'
|
||||||
|
|
||||||
import time
|
import time
|
||||||
import s3
|
import s3
|
||||||
|
|
|
@ -7,7 +7,7 @@ import sys
|
||||||
if '/srv/newsblur' not in ' '.join(sys.path):
|
if '/srv/newsblur' not in ' '.join(sys.path):
|
||||||
sys.path.append("/srv/newsblur")
|
sys.path.append("/srv/newsblur")
|
||||||
|
|
||||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings'
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
ACCESS_KEY = settings.S3_ACCESS_KEY
|
ACCESS_KEY = settings.S3_ACCESS_KEY
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
from utils.munin.base import MuninGraph
|
from utils.munin.base import MuninGraph
|
||||||
import datetime
|
import datetime
|
||||||
import os
|
import os
|
||||||
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
|
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings"
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ class NBMuninGraph(MuninGraph):
|
||||||
def stats(self):
|
def stats(self):
|
||||||
import datetime
|
import datetime
|
||||||
import os
|
import os
|
||||||
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
|
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings"
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
stats = settings.MONGOANALYTICSDB.nbanalytics.page_loads.aggregate([{
|
stats = settings.MONGOANALYTICSDB.nbanalytics.page_loads.aggregate([{
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
from utils.munin.base import MuninGraph
|
from utils.munin.base import MuninGraph
|
||||||
import os
|
import os
|
||||||
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
|
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings"
|
||||||
import django
|
import django
|
||||||
django.setup()
|
django.setup()
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/srv/newsblur/venv/newsblur3/bin/python
|
#!/srv/newsblur/venv/newsblur3/bin/python
|
||||||
from utils.munin.base import MuninGraph
|
from utils.munin.base import MuninGraph
|
||||||
import os
|
import os
|
||||||
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
|
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings"
|
||||||
import django
|
import django
|
||||||
django.setup()
|
django.setup()
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
from utils.munin.base import MuninGraph
|
from utils.munin.base import MuninGraph
|
||||||
import os
|
import os
|
||||||
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
|
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings"
|
||||||
import django
|
import django
|
||||||
django.setup()
|
django.setup()
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
from utils.munin.base import MuninGraph
|
from utils.munin.base import MuninGraph
|
||||||
import redis
|
import redis
|
||||||
import os
|
import os
|
||||||
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
|
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings"
|
||||||
import django
|
import django
|
||||||
django.setup()
|
django.setup()
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/srv/newsblur/venv/newsblur3/bin/python
|
#!/srv/newsblur/venv/newsblur3/bin/python
|
||||||
from utils.munin.base import MuninGraph
|
from utils.munin.base import MuninGraph
|
||||||
import os
|
import os
|
||||||
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
|
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings"
|
||||||
import django
|
import django
|
||||||
django.setup()
|
django.setup()
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/srv/newsblur/venv/newsblur3/bin/python
|
#!/srv/newsblur/venv/newsblur3/bin/python
|
||||||
from utils.munin.base import MuninGraph
|
from utils.munin.base import MuninGraph
|
||||||
import os
|
import os
|
||||||
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
|
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings"
|
||||||
import django
|
import django
|
||||||
django.setup()
|
django.setup()
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/srv/newsblur/venv/newsblur3/bin/python
|
#!/srv/newsblur/venv/newsblur3/bin/python
|
||||||
from utils.munin.base import MuninGraph
|
from utils.munin.base import MuninGraph
|
||||||
import os
|
import os
|
||||||
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
|
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings"
|
||||||
import django
|
import django
|
||||||
django.setup()
|
django.setup()
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/srv/newsblur/venv/newsblur3/bin/python
|
#!/srv/newsblur/venv/newsblur3/bin/python
|
||||||
from utils.munin.base import MuninGraph
|
from utils.munin.base import MuninGraph
|
||||||
import os
|
import os
|
||||||
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
|
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings"
|
||||||
|
|
||||||
class NBMuninGraph(MuninGraph):
|
class NBMuninGraph(MuninGraph):
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/srv/newsblur/venv/newsblur3/bin/python
|
#!/srv/newsblur/venv/newsblur3/bin/python
|
||||||
from utils.munin.base import MuninGraph
|
from utils.munin.base import MuninGraph
|
||||||
import os
|
import os
|
||||||
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
|
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings"
|
||||||
import django
|
import django
|
||||||
django.setup()
|
django.setup()
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
from utils.munin.base import MuninGraph
|
from utils.munin.base import MuninGraph
|
||||||
import datetime
|
import datetime
|
||||||
import os
|
import os
|
||||||
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
|
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings"
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/srv/newsblur/venv/newsblur3/bin/python
|
#!/srv/newsblur/venv/newsblur3/bin/python
|
||||||
from utils.munin.base import MuninGraph
|
from utils.munin.base import MuninGraph
|
||||||
import os
|
import os
|
||||||
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
|
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings"
|
||||||
import django
|
import django
|
||||||
django.setup()
|
django.setup()
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
import redis
|
import redis
|
||||||
from utils.munin.base import MuninGraph
|
from utils.munin.base import MuninGraph
|
||||||
import os
|
import os
|
||||||
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
|
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings"
|
||||||
import django
|
import django
|
||||||
django.setup()
|
django.setup()
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/srv/newsblur/venv/newsblur3/bin/python
|
#!/srv/newsblur/venv/newsblur3/bin/python
|
||||||
from utils.munin.base import MuninGraph
|
from utils.munin.base import MuninGraph
|
||||||
import os
|
import os
|
||||||
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
|
os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings"
|
||||||
import django
|
import django
|
||||||
django.setup()
|
django.setup()
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ from utils.image_functions import ImageOps
|
||||||
if '/srv/newsblur' not in ' '.join(sys.path):
|
if '/srv/newsblur' not in ' '.join(sys.path):
|
||||||
sys.path.append("/srv/newsblur")
|
sys.path.append("/srv/newsblur")
|
||||||
|
|
||||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings'
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
ACCESS_KEY = settings.S3_ACCESS_KEY
|
ACCESS_KEY = settings.S3_ACCESS_KEY
|
||||||
|
|
|
@ -9,7 +9,7 @@ import sys
|
||||||
from requests.exceptions import ConnectionError
|
from requests.exceptions import ConnectionError
|
||||||
|
|
||||||
sys.path.insert(0, '/srv/newsblur')
|
sys.path.insert(0, '/srv/newsblur')
|
||||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings'
|
||||||
import fabfile
|
import fabfile
|
||||||
|
|
||||||
NEWSBLUR_USERNAME = 'sclay'
|
NEWSBLUR_USERNAME = 'sclay'
|
||||||
|
|
|
@ -9,7 +9,7 @@ from optparse import OptionParser
|
||||||
from requests.exceptions import ConnectionError
|
from requests.exceptions import ConnectionError
|
||||||
|
|
||||||
sys.path.insert(0, '/srv/newsblur')
|
sys.path.insert(0, '/srv/newsblur')
|
||||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings'
|
os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings'
|
||||||
import fabfile
|
import fabfile
|
||||||
|
|
||||||
NEWSBLUR_USERNAME = 'sclay'
|
NEWSBLUR_USERNAME = 'sclay'
|
||||||
|
|
Loading…
Add table
Reference in a new issue