Restructure the app

Author: pmartynov

conf_templates/gunicorn.sh

@@ -22,4 +22,4 @@ exec gunicorn --pythonpath "%(DEPLOY_DIR)s" \
     --group "%(GROUP)s" \
     --log-level "info" \
     --log-file "$LOG_FILE" \
-    steepshot_io.config.wsgi:application
+    steepshot_io.wsgi:application

fabfile.py

@@ -233,7 +233,7 @@ def migrate():
     with cd(DEPLOY_DIR):
         with settings(sudo_user=DEPLOYMENT_USER,
                       sudo_prefix=SUDO_PREFIX), prefix('workon steepshot_io'):
-            sudo('python steepshot_io/manage.py migrate')
+            sudo('python manage.py migrate')
 
 
 def config_celery(remote_conf_path):
@@ -417,8 +417,8 @@ def deploy_static():
     with settings(sudo_user=DEPLOYMENT_USER,
                   sudo_prefix=SUDO_PREFIX), cd(DEPLOY_DIR):
         with prefix('workon %s' % ENV_NAME):
-            sudo('python steepshot_io/manage.py collectstatic --noinput --settings %s'
-                 % env.settings_module.replace('steepshot_io.', ''))
+            sudo('python manage.py collectstatic --noinput --settings %s'
+                 % env.settings_module)
 
 
 @task
@@ -435,7 +435,7 @@ def createsuperuser():
     with settings(sudo_user=DEPLOYMENT_USER,
                   sudo_prefix=SUDO_PREFIX):
         with prefix('workon %s' % ENV_NAME):
-            sudo('python steepshot_io/manage.py createsuperuser '
+            sudo('python manage.py createsuperuser '
                  '--settings ' + env.settings_module)
 
 

steepshot_io/manage.py manage.py

@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.prod_settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "prod_settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError:

steepshot_io/celeryapp.py

@@ -7,7 +7,7 @@
 from django.conf import settings
 
 # Indicate Celery to use the default Django settings module
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.prod_settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'prod_settings')
 
 app = Celery('steepshot_io')
 app.config_from_object('django.conf:settings')

steepshot_io/config/__init__.py

@@ -73,8 +73,8 @@
 GUNI_TIMEOUT = 60
 GUNI_GRACEFUL_TIMEOUT = 180
 
-SETTINGS_MODULE = 'steepshot_io.config.prod_settings'
-GOLOS_SETTINGS_MODULE = 'steepshot_io.config.golos_prod_settings'
+SETTINGS_MODULE = 'steepshot_io.prod_settings'
+GOLOS_SETTINGS_MODULE = 'steepshot_io.golos_prod_settings'
 
 
 ENVIRONMENTS = {

steepshot_io/deploy_settings.py

@@ -14,7 +14,7 @@
 import dj_database_url
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
 # Quick-start development settings - unsuitable for production
@@ -34,7 +34,7 @@
 else:
     LOCAL = False
 
-PROJECT_PATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+PROJECT_PATH = os.path.dirname(os.path.abspath(__file__))
 
 if DEBUG:
     ALLOWED_HOSTS = ['*']
@@ -80,7 +80,7 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-ROOT_URLCONF = 'config.urls'
+ROOT_URLCONF = 'urls'
 
 TEMPLATES = [
     {
@@ -106,7 +106,7 @@
     },
 ]
 
-WSGI_APPLICATION = 'config.wsgi.application'
+WSGI_APPLICATION = 'wsgi.application'
 
 
 # Database