diff --git a/.devcontainer/Dockerfile.dev b/.devcontainer/Dockerfile.dev index 80a45f6f7..bf3306d07 100644 --- a/.devcontainer/Dockerfile.dev +++ b/.devcontainer/Dockerfile.dev @@ -50,6 +50,11 @@ COPY <`_, this will make TIRA work with it. (1) Since TIRA has a legacy and a Disraptor :code:`deployment` mode first change that to :code:`disraptor` in the - development config file :code:`application/config/tira-application-config.dev.yml`. + development config file :code:`application/config/tira-application-config.yml`. (2) When you set up Disraptor you set a :code:`Disraptor App Secret Key` that allows Disraptor to communicate with your web application. Since TIRA has to evaluate that this secret is correct we have to supply it to it. TIRA expects that secret in an environment variable called :code:`DISRAPTOR_APP_SECRET_KEY`, so before starting your development @@ -171,7 +171,7 @@ Setup on MacOS (Monterey/M1) .. code:: bash brew install python@3.10 pipenv pyvenv mariadb uwsgi -(2) Inside :code:`tira/application/config/tira-application-config.dev.yml` change :code:`tira_root` to the model you +(2) Inside :code:`tira/application/config/tira-application-config.yml` change :code:`tira_root` to the model you want to use. (3) From within :code:`tira/application` execute the makefile at least once. This copies the config and runs :code:`manage.py index_model` once. diff --git a/model/.gitignore b/model/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/model/requirements.txt b/model/requirements.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/pipelines/src/django_tira_git/settings.py b/pipelines/src/django_tira_git/settings.py index 63a27b07b..83550d1a6 100644 --- a/pipelines/src/django_tira_git/settings.py +++ b/pipelines/src/django_tira_git/settings.py @@ -26,22 +26,19 @@ # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = custom_settings.get("django_secret", "not-so-secret") +SECRET_KEY = custom_settings["django_secret"] # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = custom_settings.get("debug", True) -ALLOWED_HOSTS = custom_settings.get("allowed_hosts", []) +DEBUG = custom_settings["debug"] +ALLOWED_HOSTS = custom_settings["allowed_hosts"] -TIRA_ROOT = Path( - custom_settings.get("tira_root", BASE_DIR.parents[1] / "tira-model" / "src") -) +TIRA_ROOT = Path(custom_settings["tira_root"]) if not TIRA_ROOT.is_dir(): raise FileNotFoundError( f"TIRA_ROOT must point to an existing tira model but points to {TIRA_ROOT} instead." ) -DEPLOYMENT = custom_settings.get("deployment", "disraptor") DISRAPTOR_SECRET_FILE = Path( custom_settings.get("disraptor_secret_file", "/etc/discourse/client-api-key") )