update newsblur dir to newsblur_web in code

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()

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:

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)

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

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

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

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

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

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

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
 
 

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([{

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()
 

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()
 

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()
 

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()
 

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()
 

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()
 

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()
 

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):
 

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()
 

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
 
 

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()
 

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()
 

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()
 

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

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'

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'