diff --git a/apps/analyzer/tasks.py b/apps/analyzer/tasks.py index ff8c9516e..c41736d12 100644 --- a/apps/analyzer/tasks.py +++ b/apps/analyzer/tasks.py @@ -1,4 +1,4 @@ -from newsblur.celeryapp import app +from newsblur_web.celeryapp import app from utils import log as logging @app.task() diff --git a/fabfile.py b/fabfile.py index c8f9cbb03..e7bd86e88 100644 --- a/fabfile.py +++ b/fabfile.py @@ -25,7 +25,7 @@ except ImportError: print("Digital Ocean's API not loaded. Install python-digitalocean.") -django.settings_module('newsblur.settings') +django.settings_module('newsblur_web.settings') try: from django.conf import settings as django_settings except ImportError: diff --git a/flask_monitor/db_monitor.py b/flask_monitor/db_monitor.py index 23ffc8df0..506509179 100644 --- a/flask_monitor/db_monitor.py +++ b/flask_monitor/db_monitor.py @@ -103,7 +103,7 @@ def db_check_redis_story(): abort(404) @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'}) try: r = redis.Redis(redis_host['host'], db=1) diff --git a/utils/backups/backup_mongo.py b/utils/backups/backup_mongo.py index fab26c07b..ef4666f68 100644 --- a/utils/backups/backup_mongo.py +++ b/utils/backups/backup_mongo.py @@ -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'] = 'newsblur.settings' +os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings' import time import s3 diff --git a/utils/backups/backup_psql.py b/utils/backups/backup_psql.py index 2be45afc9..48ff0e895 100644 --- a/utils/backups/backup_psql.py +++ b/utils/backups/backup_psql.py @@ -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'] = 'newsblur.settings' +os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings' import time import s3 diff --git a/utils/backups/backup_redis.py b/utils/backups/backup_redis.py index d1c0f991a..48676a846 100644 --- a/utils/backups/backup_redis.py +++ b/utils/backups/backup_redis.py @@ -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'] = 'newsblur.settings' +os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings' import time import s3 diff --git a/utils/backups/backup_redis_sessions.py b/utils/backups/backup_redis_sessions.py index 9d27dfeba..6e853cc62 100644 --- a/utils/backups/backup_redis_sessions.py +++ b/utils/backups/backup_redis_sessions.py @@ -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'] = 'newsblur.settings' +os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings' import time import s3 diff --git a/utils/backups/backup_redis_story.py b/utils/backups/backup_redis_story.py index 2d23ea300..56d73014c 100644 --- a/utils/backups/backup_redis_story.py +++ b/utils/backups/backup_redis_story.py @@ -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'] = 'newsblur.settings' +os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings' import time import s3 diff --git a/utils/backups/s3.py b/utils/backups/s3.py index 8a59365bb..4e08493bf 100644 --- a/utils/backups/s3.py +++ b/utils/backups/s3.py @@ -7,7 +7,7 @@ import sys if '/srv/newsblur' not in ' '.join(sys.path): 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 ACCESS_KEY = settings.S3_ACCESS_KEY diff --git a/utils/munin/newsblur_app_servers.py b/utils/munin/newsblur_app_servers.py index bb50d0ec6..96be3dd79 100755 --- a/utils/munin/newsblur_app_servers.py +++ b/utils/munin/newsblur_app_servers.py @@ -2,7 +2,7 @@ from utils.munin.base import MuninGraph import datetime import os -os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings" +os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings" from django.conf import settings diff --git a/utils/munin/newsblur_app_times.py b/utils/munin/newsblur_app_times.py index 446968dc8..228c9963a 100755 --- a/utils/munin/newsblur_app_times.py +++ b/utils/munin/newsblur_app_times.py @@ -28,7 +28,7 @@ class NBMuninGraph(MuninGraph): def stats(self): import datetime import os - os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings" + os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings" from django.conf import settings stats = settings.MONGOANALYTICSDB.nbanalytics.page_loads.aggregate([{ diff --git a/utils/munin/newsblur_classifiers.py b/utils/munin/newsblur_classifiers.py index 0a7f9e12b..e06515eb7 100755 --- a/utils/munin/newsblur_classifiers.py +++ b/utils/munin/newsblur_classifiers.py @@ -2,7 +2,7 @@ from utils.munin.base import MuninGraph import os -os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings" +os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings" import django django.setup() diff --git a/utils/munin/newsblur_dbtimes.py b/utils/munin/newsblur_dbtimes.py index b5198b62f..46a7668d2 100755 --- a/utils/munin/newsblur_dbtimes.py +++ b/utils/munin/newsblur_dbtimes.py @@ -1,7 +1,7 @@ #!/srv/newsblur/venv/newsblur3/bin/python from utils.munin.base import MuninGraph import os -os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings" +os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings" import django django.setup() diff --git a/utils/munin/newsblur_errors.py b/utils/munin/newsblur_errors.py index 3a9087b23..0e1f0d83d 100755 --- a/utils/munin/newsblur_errors.py +++ b/utils/munin/newsblur_errors.py @@ -2,7 +2,7 @@ from utils.munin.base import MuninGraph import os -os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings" +os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings" import django django.setup() diff --git a/utils/munin/newsblur_feed_counts.py b/utils/munin/newsblur_feed_counts.py index 8d55f65ca..1ed4ff518 100755 --- a/utils/munin/newsblur_feed_counts.py +++ b/utils/munin/newsblur_feed_counts.py @@ -2,7 +2,7 @@ from utils.munin.base import MuninGraph import redis import os -os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings" +os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings" import django django.setup() diff --git a/utils/munin/newsblur_feeds.py b/utils/munin/newsblur_feeds.py index 87ba8e93a..61857dbc8 100755 --- a/utils/munin/newsblur_feeds.py +++ b/utils/munin/newsblur_feeds.py @@ -1,7 +1,7 @@ #!/srv/newsblur/venv/newsblur3/bin/python from utils.munin.base import MuninGraph import os -os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings" +os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings" import django django.setup() diff --git a/utils/munin/newsblur_loadtimes.py b/utils/munin/newsblur_loadtimes.py index dd7854649..05a76eb32 100755 --- a/utils/munin/newsblur_loadtimes.py +++ b/utils/munin/newsblur_loadtimes.py @@ -1,7 +1,7 @@ #!/srv/newsblur/venv/newsblur3/bin/python from utils.munin.base import MuninGraph import os -os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings" +os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings" import django django.setup() diff --git a/utils/munin/newsblur_stories.py b/utils/munin/newsblur_stories.py index e5ff4e7c7..9b71664a0 100755 --- a/utils/munin/newsblur_stories.py +++ b/utils/munin/newsblur_stories.py @@ -1,7 +1,7 @@ #!/srv/newsblur/venv/newsblur3/bin/python from utils.munin.base import MuninGraph import os -os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings" +os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings" import django django.setup() diff --git a/utils/munin/newsblur_tasks_codes.py b/utils/munin/newsblur_tasks_codes.py index 90b263db8..94106899d 100755 --- a/utils/munin/newsblur_tasks_codes.py +++ b/utils/munin/newsblur_tasks_codes.py @@ -1,7 +1,7 @@ #!/srv/newsblur/venv/newsblur3/bin/python from utils.munin.base import MuninGraph import os -os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings" +os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings" class NBMuninGraph(MuninGraph): diff --git a/utils/munin/newsblur_tasks_pipeline.py b/utils/munin/newsblur_tasks_pipeline.py index 9be160931..430918f73 100755 --- a/utils/munin/newsblur_tasks_pipeline.py +++ b/utils/munin/newsblur_tasks_pipeline.py @@ -1,7 +1,7 @@ #!/srv/newsblur/venv/newsblur3/bin/python from utils.munin.base import MuninGraph import os -os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings" +os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings" import django django.setup() diff --git a/utils/munin/newsblur_tasks_servers.py b/utils/munin/newsblur_tasks_servers.py index 8eb57b727..3b1286a02 100755 --- a/utils/munin/newsblur_tasks_servers.py +++ b/utils/munin/newsblur_tasks_servers.py @@ -2,7 +2,7 @@ from utils.munin.base import MuninGraph import datetime import os -os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings" +os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings" from django.conf import settings diff --git a/utils/munin/newsblur_tasks_times.py b/utils/munin/newsblur_tasks_times.py index acb842505..7f2fcade9 100755 --- a/utils/munin/newsblur_tasks_times.py +++ b/utils/munin/newsblur_tasks_times.py @@ -1,7 +1,7 @@ #!/srv/newsblur/venv/newsblur3/bin/python from utils.munin.base import MuninGraph import os -os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings" +os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings" import django django.setup() diff --git a/utils/munin/newsblur_updates.py b/utils/munin/newsblur_updates.py index 2a0a7fe4c..536f50a97 100755 --- a/utils/munin/newsblur_updates.py +++ b/utils/munin/newsblur_updates.py @@ -2,7 +2,7 @@ import redis from utils.munin.base import MuninGraph import os -os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings" +os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings" import django django.setup() diff --git a/utils/munin/newsblur_users.py b/utils/munin/newsblur_users.py index 52f6722b9..a2083ea95 100755 --- a/utils/munin/newsblur_users.py +++ b/utils/munin/newsblur_users.py @@ -1,7 +1,7 @@ #!/srv/newsblur/venv/newsblur3/bin/python from utils.munin.base import MuninGraph import os -os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings" +os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur_web.settings" import django django.setup() diff --git a/utils/s3_utils.py b/utils/s3_utils.py index 7cd38ef72..7a3374fbb 100644 --- a/utils/s3_utils.py +++ b/utils/s3_utils.py @@ -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'] = 'newsblur.settings' +os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings' from django.conf import settings ACCESS_KEY = settings.S3_ACCESS_KEY diff --git a/utils/tlnb.py b/utils/tlnb.py index 67774b784..6363e419e 100755 --- a/utils/tlnb.py +++ b/utils/tlnb.py @@ -9,7 +9,7 @@ import sys from requests.exceptions import ConnectionError sys.path.insert(0, '/srv/newsblur') -os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings' +os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings' import fabfile NEWSBLUR_USERNAME = 'sclay' diff --git a/utils/zgrep.py b/utils/zgrep.py index 19856c408..0eee6432e 100755 --- a/utils/zgrep.py +++ b/utils/zgrep.py @@ -9,7 +9,7 @@ from optparse import OptionParser from requests.exceptions import ConnectionError sys.path.insert(0, '/srv/newsblur') -os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur.settings' +os.environ['DJANGO_SETTINGS_MODULE'] = 'newsblur_web.settings' import fabfile NEWSBLUR_USERNAME = 'sclay'