Merge pull request #97 from project-lovelace/ali/cleanup

populate_development_env.bash

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# This might be dangerous... I once accidently flushed production lol.
 # echo "Flushing Django database..."
 # docker-compose exec django python manage.py flush --no-input
 
@@ -10,4 +11,4 @@ echo "Populating Django database..."
 docker-compose exec django python manage.py loaddata lovelace_django_dumpdata.json
 
 echo "Collecting static files..."
-python manage.py collectstatic --no-input
+docker-compose exec django python manage.py collectstatic --no-input

src/Dockerfile.prod

@@ -31,7 +31,7 @@ RUN pip install --upgrade pip &&\
     pip install -r requirements.txt
 
 # copy entrypoint-prod.sh
-COPY ./entrypoint.prod.sh $APP_HOME
+COPY ./entrypoint.sh $APP_HOME
 
 # copy project
 COPY . $APP_HOME
@@ -42,5 +42,5 @@ RUN chown -R app:app $APP_HOME
 # change to the app user
 USER app
 
-# run entrypoint.prod.sh
-ENTRYPOINT ["/home/app/django/entrypoint.prod.sh"]
+# run entrypoint.sh
+ENTRYPOINT ["/home/app/django/entrypoint.sh"]

src/entrypoint.sh

@@ -10,16 +10,4 @@ then
     echo "PostgreSQL started"
 fi
 
-echo "Flushing Django database..."
-python manage.py flush --no-input
-
-echo "Migrating Django changes..."
-python manage.py migrate --no-input
-
-echo "Populating Django database..."
-python manage.py loaddata lovelace_django_dumpdata.json
-
-echo "Collecting static files..."
-python manage.py collectstatic --no-input
-
 exec "$@"

src/lovelace/forms.py

@@ -9,7 +9,7 @@
 
 class CustomRegistrationForm(RegistrationForm):
     """
-    Subclass of ``RegistrationForm`` that enforces case-insensitive unique usernames
+    Subclass of `RegistrationForm` that enforces case-insensitive unique usernames
     and unique email addresses.
     """
     def __init__(self, *args, **kwargs):

src/lovelace/settings.py

@@ -146,7 +146,7 @@
 EMAIL_USE_TLS = True
 # EMAIL_USE_SSL = True
 
-# These are used by send_mass_email.py
+# These are used by the send_mass_email.py custom command
 LOVELACE_FROM_EMAIL = os.environ.get("LOVELACE_FROM_EMAIL")
 MAILGUN_API_URL = os.environ.get("MAILGUN_API_URL")
 MAILGUN_API_KEY = os.environ.get("MAILGUN_API_KEY")

src/lovelace/views.py

@@ -7,17 +7,10 @@
 from django.shortcuts import render, redirect
 
 from django_registration.backends.activation.views import RegistrationView
-# from django_registration.views import RegistrationView
 
 from .forms import CustomRegistrationForm
 from users.models import UserProfile
 
-# from django.contrib.auth import login
-# from django.core.exceptions import ValidationError
-# from django.shortcuts import render, redirect
-# from django.contrib.auth import login, authenticate
-
-
 logger = logging.getLogger('django.' + __name__)
 
 

src/lovelace/wsgi.py

@@ -1,7 +1,7 @@
 """
 WSGI config for lovelace project.
 
-It exposes the WSGI callable as a module-level variable named ``application``.
+It exposes the WSGI callable as a module-level variable named `application`.
 
 For more information on this file, see
 https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/
@@ -11,14 +11,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-# Development
-# sys.path.append('/lovelace/lovelace-website/src/')
-# sys.path.append('/lovelace/envs/website/lib/python3.7/site-packages/')
-
-# Production
-sys.path.append('/var/www/projectlovelace.net/lovelace-website/src/')
-sys.path.append('/var/www/projectlovelace.net/lovelace_website_env/lib/python3.7/site-packages/')
-
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "lovelace.settings")
 
 application = get_wsgi_application()