Store interactive tool sessions in PostgreSQL table "gxitproxy"

usegalaxy-eu · Jul 4, 2024 · ea9e1c1 · ea9e1c1
1 parent 66b36c5
commit ea9e1c1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/group_vars/gxconfig.yml b/group_vars/gxconfig.yml
@@ -958,10 +958,13 @@ base_app_main: &BASE_APP_MAIN
   # subdomain. Defaults to "/".
   #interactivetools_base_path: /
 
-  # Map for interactivetool proxy.
-  # The value of this option will be resolved with respect to
-  # <data_dir>.
-  interactivetools_map: "{{ galaxy_mutable_data_dir }}/interactivetools_map.sqlite"
+  # Map for interactivetool proxy. It may be either a path to a SQLite
+  # database or a SQLAlchemy database URL (see
+  # https://docs.sqlalchemy.org/en/20/core/engines.html#database-urls).
+  # In either case, mappings will be written to the table "gxitproxy" within the
+  # database. If it is a path, the value of this option will be resolved with
+  # respect to <data_dir>.
+  interactivetools_map: "{{ galaxy_db_connection }}"
 
   # Prefix to use in the formation of the subdomain or path for
   # interactive tools

diff --git a/group_vars/sn06.yml b/group_vars/sn06.yml
@@ -226,13 +226,13 @@ galaxy_systemd_memory_limit_workflow: 15
 
 # gie_proxy
 gie_proxy_dir: "{{ galaxy_root }}/gie-proxy/proxy"
-gie_proxy_git_version: main
+gie_proxy_git_version: v0.1.0
 gie_proxy_setup_nodejs: nodeenv
 gie_proxy_virtualenv_command: "{{ conda_prefix }}/envs/_galaxy_/bin/python -m venv --copies" #"{{ pip_virtualenv_command }}"
-gie_proxy_nodejs_version: "10.13.0"
+gie_proxy_nodejs_version: "14.21.3"
 gie_proxy_virtualenv: "{{ galaxy_root }}/gie-proxy/venv"
 gie_proxy_setup_service: systemd
-gie_proxy_sessions_path: "{{ galaxy_mutable_data_dir }}/interactivetools_map.sqlite"
+gie_proxy_sessions_path: "{{ galaxy_db_connection }}"
 gie_proxy_port: 8800
 gie_proxy_verbose: true
 

diff --git a/group_vars/sn07.yml b/group_vars/sn07.yml
@@ -280,13 +280,13 @@ condor_extra: |
 
 # gie_proxy
 gie_proxy_dir: "{{ galaxy_root }}/gie-proxy/proxy"
-gie_proxy_git_version: main
+gie_proxy_git_version: v0.1.0
 gie_proxy_setup_nodejs: nodeenv
 gie_proxy_virtualenv_command: "{{ conda_prefix }}/envs/_galaxy_/bin/python -m venv --copies" #"{{ pip_virtualenv_command }}"
-gie_proxy_nodejs_version: "10.13.0"
+gie_proxy_nodejs_version: "14.21.3"
 gie_proxy_virtualenv: "{{ galaxy_root }}/gie-proxy/venv"
 gie_proxy_setup_service: systemd
-gie_proxy_sessions_path: "{{ galaxy_mutable_data_dir }}/interactivetools_map.sqlite"
+gie_proxy_sessions_path: "{{ galaxy_db_connection }}"
 gie_proxy_port: 8800
 gie_proxy_verbose: true