diff --git a/backend/ianalyzer/settings.py b/backend/ianalyzer/settings.py index 3b4ff3e32..7d2c19a09 100644 --- a/backend/ianalyzer/settings.py +++ b/backend/ianalyzer/settings.py @@ -116,6 +116,8 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'data') +SAML_CSP_HANDLER = '' + # This needs to be the last line of the settings.py, so that all settings can be overridden. try: from ianalyzer.settings_local import * @@ -124,3 +126,4 @@ 'No local settings file - configure your environment in backend/ianalyzer/settings_local.py', Warning ) + diff --git a/backend/requirements.in b/backend/requirements.in index 25a97e55e..fe7800972 100644 --- a/backend/requirements.in +++ b/backend/requirements.in @@ -1,4 +1,4 @@ -Django>=4.0.1,<5 +Django>=5.2 djangorestframework dj-rest-auth[with_social] django-livereload-server diff --git a/backend/requirements.txt b/backend/requirements.txt index 1c1b0c699..4646fe8f9 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --cert=None --client-cert=None --index-url=None --pip-args=None +# pip-compile # amqp==5.3.1 # via kombu @@ -54,9 +54,9 @@ defusedxml==0.7.1 # djangosaml2 # pysaml2 # python3-openid -dj-rest-auth[with-social,with_social]==4.0.1 +dj-rest-auth[with-social]==4.0.1 # via -r requirements.in -django==4.2.27 +django==5.2.7 # via # -r requirements.in # dj-rest-auth diff --git a/documentation/First-time-setup.md b/documentation/First-time-setup.md index 0aa4d2be9..3ec0cb714 100644 --- a/documentation/First-time-setup.md +++ b/documentation/First-time-setup.md @@ -5,7 +5,7 @@ These are instructions to set up an Textcavator server. If you are going to deve ## Prerequisites * Python == 3.12 -* PostgreSQL >= 12, client, server and C libraries +* PostgreSQL >= 14, client, server and C libraries * [ElasticSearch](https://www.elastic.co/) 8. To avoid a lot of errors, choose the option: install elasticsearch with .zip or .tar.gz. ES wil install everything in one folder, and not all over your machine, which happens with other options. * [Redis](https://www.redis.io/). Recommended installation is [installing from source](https://redis.io/docs/getting-started/installation/install-redis-from-source/) * [Node.js](https://nodejs.org/). See [.nvmrc](/.nvmrc) for the recommended version. @@ -30,6 +30,16 @@ yarn postinstall psql -f backend/create_db.sql yarn django migrate ``` + +> [!NOTE] +> With Postgresql 15 later, you may need to grant privileges on the schema too. Use the `psql` command in the terminal, and run the following: +> +> ``` +> \c ianalyzer +> grant all privileges on all tables in schema public to ianalyzer; +> ``` +> + 5. Make a superuser account with `yarn django createsuperuser` ## Setup with Docker