changes from desktop computer

blechreiz/settings.py

@@ -4,6 +4,8 @@ import os
 
 gettext = lambda s: s
 PROJECT_PATH = os.path.abspath(os.path.dirname(__file__))
+DATA_PATH = os.environ.get('BLECHREIZ_DATA', default=os.path.join(PROJECT_PATH, "data"))
+
 
 # Django settings for blechreiz project.
 
@@ -19,7 +21,7 @@ MANAGERS = ADMINS
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(PROJECT_PATH, 'database.sqlite'),
+        'NAME': os.path.join(DATA_PATH, 'database.sqlite'),
     }
 }
 
@@ -59,7 +61,7 @@ USE_TZ = True
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/var/www/example.com/media/"
-MEDIA_ROOT = PROJECT_PATH + "/media/"
+MEDIA_ROOT = PROJECT_PATH + "/media"
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
@@ -81,7 +83,7 @@ PUBLIC_URLS = ("^musicians/login/?$", "^musicians/login/usernames/?$", "^eventpl
 
 # Additional locations of static files
 STATICFILES_DIRS = (
-    PROJECT_PATH + '/static',
+    #PROJECT_PATH + '/static',
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
@@ -122,6 +124,7 @@ TEMPLATES = [
 
 MIDDLEWARE = (
     'django.middleware.security.SecurityMiddleware',
+    'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -178,9 +181,12 @@ GCAL_COUPLING = {
     'developerKey': 'blechreiz-homepage',
     'clientId': '34462582242-4kpdvvbi27ajt4u22uitqurpve9o8ipj.apps.googleusercontent.com',
     'client_secret': 'y4t9XBrJdCODPTO5UvtONWWn',
-    'credentials_file': PROJECT_PATH + '/calendarCredentials.dat',
+    'credentials_file': DATA_PATH + '/calendarCredentials.dat',
     'push_url': "https://blechreiz.bauer.technology/eventplanner_gcal/gcalApiCallback",
 }
+GOOGLE_MAPS_API_KEY = 'AIzaSyCf9Lm5ckjmVd08scTOd7fB1dC_UCoumKg'
+GCAL_SYNC_ENABLED = True
+
 
 CRISPY_TEMPLATE_PACK = 'bootstrap'
 
@@ -207,7 +213,7 @@ LOGGING = {
         'file': {
             'level': 'DEBUG',
             'class': 'logging.FileHandler',
-            'filename': PROJECT_PATH + '/eventplanner.log',
+            'filename': DATA_PATH + '/eventplanner.log',
         },
     },
     'loggers': {
@@ -225,4 +231,3 @@ LOGGING = {
 
 }
 
-GOOGLE_MAPS_API_KEY = 'AIzaSyCf9Lm5ckjmVd08scTOd7fB1dC_UCoumKg'

blechreiz/wsgi.py

@@ -15,14 +15,6 @@ framework.
 """
 import os
 
-# Own stuff to deploy on blechreiz.bauer.technology
-import site
-import sys
-site.addsitedir('/srv/blechreiz/env/lib/python2.7/site-packages')
-sys.path.append('/srv/blechreiz')
-
-
-
 # We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
 # if running multiple sites in the same mod_wsgi process. To fix this, use
 # mod_wsgi daemon mode with each site in its own daemon process, or use