diff --git a/SAS/LSMR/bin/lsmr b/SAS/LSMR/bin/lsmr index 570bb46a46697e8424436b0180cc4e1f4bf5b80c..6ee38285d302001c44fd4c3bc828bf30a4e9c6c3 100644 --- a/SAS/LSMR/bin/lsmr +++ b/SAS/LSMR/bin/lsmr @@ -24,5 +24,6 @@ echo "---" echo "! This is for testing only, properly deploy in Nginx or Apache for production use!" echo "---" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +/usr/bin/python $DIR/../lib*/python3.4/site-packages/lofar/sas/lsmr/manage.py migrate /usr/bin/python $DIR/../lib*/python3.4/site-packages/lofar/sas/lsmr/manage.py runserver 0.0.0.0:8000 diff --git a/SAS/LSMR/src/CMakeLists.txt b/SAS/LSMR/src/CMakeLists.txt index 59947a0ce3f4938fb280675a2b032adf635280e7..b294cfc6e56f2d0f5cf0de578145fd53b7b92dfa 100644 --- a/SAS/LSMR/src/CMakeLists.txt +++ b/SAS/LSMR/src/CMakeLists.txt @@ -7,7 +7,6 @@ find_python_module(ldap REQUIRED) set(_py_files manage.py - urls.py ) python_install(${_py_files} diff --git a/SAS/LSMR/src/lsmr/settings.py b/SAS/LSMR/src/lsmr/settings.py index ea094208acb88cc7e08bd033dc0fba1697ee0069..9f7b5c2a176b61578ac0b133f1185a3db8936b61 100644 --- a/SAS/LSMR/src/lsmr/settings.py +++ b/SAS/LSMR/src/lsmr/settings.py @@ -31,6 +31,7 @@ ALLOWED_HOSTS = [] # Application definition INSTALLED_APPS = [ + 'lsmr.lsmrapp', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -76,12 +77,19 @@ WSGI_APPLICATION = 'lsmr.wsgi.application' DATABASES = { 'default': { + # SQLITE: 'ENGINE': 'django.db.backends.sqlite3', 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + # Postgres: + #'ENGINE': 'django.db.backends.postgresql_psycopg2', + #'NAME': 'lsmr', + #'USER': 'lsmr', + #'PASSWORD': 'fixme', + #'HOST': 'localhost', + #'PORT': '', } } - # Password validation # https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators