diff --git a/.gitignore b/.gitignore index e882e145fcec335b65eaeade223514c9ce1824a0..7cd94db8e4e3b989be1fb2f7f32a11f949533709 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ local_settings.py #tmp files appointment-import/testFiles/~* appointment-import/tmp.sql +.idea +*.iml diff --git a/readme.md b/readme.md index ebabb3fd11f567f25326f7af08f3fb79a0a438a3..3214f721cf79429cc6476a7ac6604496677cc83d 100644 --- a/readme.md +++ b/readme.md @@ -14,39 +14,8 @@ - `virtualenv env` to create new virtualenv (contains clean python working environment) - `. env/bin/activate` (to start using virtualenv) - `pip install -r requirements.txt` to install project's dependencies - - Create `local_settings.py` file in `(./scheduling-system)/smash/smash` directory (see template below), and change your database connection data: + - Create `local_settings.py` file in `(./scheduling-system)/smash/smash` directory by copying the template in `(./scheduling-system)/smash/smash/local_settings.template` and edit your local_setttings.py file to change your database connection data. -``` -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'Paste long random string here' # Insert long random string - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -WSGI_APPLICATION = 'smash.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/1.10/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'smashdb', # Insert your database's name - 'USER': 'postgresmashuser', # Insert your database's user - 'PASSWORD': 'thePOSTGRESpassword', # Insert your user's password - 'HOST': 'localhost', - 'PORT': '' # '' === default one # Empty string is OK - - # If to use sqlite - # 'ENGINE': 'django.db.backends.sqlite3', - # 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - } -} - -STATIC_ROOT = '/tmp/static' # Warning! `/tmp` directory can be flushed in any moment; use a persistent one; e.g. ~/tmp/static -MEDIA_ROOT = '/tmp/media' # Warning! `/tmp` directory can be flushed in any moment; use a persistent one, e.g. ~/tmp/media -``` - Update migration db scrpit from file structure (`./scheduling-system/smash/manage.py makemigrations`) - Create the database by applying migrations (`./scheduling-system/smash/manage.py migrate`) - Create the first, administrative, user- (`./scheduling-system/smash/manage.py createsuperuser`) diff --git a/requirements.txt b/requirements.txt index 8ddce39523486fbd85b734c6cc1a11d671a2be22..57e916dd630ac9a2b6f598607e37f97050cce20b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ Django==1.10.3 gunicorn==19.6.0 Pillow==3.4.2 -pkg-resources==0.0.0 psycopg2==2.6.2 diff --git a/smash/smash/local_settings.py.template b/smash/smash/local_settings.py.template new file mode 100644 index 0000000000000000000000000000000000000000..b5c398c064b0b58992f6adf380bdb94b6ebc15a9 --- /dev/null +++ b/smash/smash/local_settings.py.template @@ -0,0 +1,29 @@ +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'Paste long random string here' # Insert long random string + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +WSGI_APPLICATION = 'smash.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.10/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'smashdb', # Insert your database's name + 'USER': 'postgresmashuser', # Insert your database's user + 'PASSWORD': 'thePOSTGRESpassword', # Insert your user's password + 'HOST': 'localhost', + 'PORT': '' # '' === default one # Empty string is OK + + # If to use sqlite + # 'ENGINE': 'django.db.backends.sqlite3', + # 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + +STATIC_ROOT = '/tmp/static' # Warning! `/tmp` directory can be flushed in any moment; use a persistent one; e.g. ~/tmp/static +MEDIA_ROOT = '/tmp/media' # Warning! `/tmp` directory can be flushed in any moment; use a persistent one, e.g. ~/tmp/media