Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Store interactive tool sessions in PostgreSQL database "gxitproxy" #1251

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions group_vars/gxconfig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -958,10 +958,23 @@ base_app_main: &BASE_APP_MAIN
# subdomain. Defaults to "/".
#interactivetools_base_path: /

# Map for interactivetool proxy.
# Map for the interactivetool proxy. Mappings are stored in a SQLite
# database file located on this path. As an alternative, you may also
# store them in any other RDBMS supported by SQLAlchemy using the
# option ``interactivetoolsproxy_map``, which overrides this one.
# The value of this option will be resolved with respect to
# <data_dir>.
interactivetools_map: "{{ galaxy_mutable_data_dir }}/interactivetools_map.sqlite"
#interactivetools_map: interactivetools_map.sqlite

# Use a database supported by SQLAlchemy as map for the
# interactivetool proxy. When this option is set, the value of
# ``interactivetools_map`` is ignored. The value of this option must
# be a `SQLAlchemy database URL
# <https://docs.sqlalchemy.org/en/20/core/engines.html#database-urls>`_.
# Mappings are written to the table "gxitproxy" within the database.
# This value cannot match ``database_connection`` nor
# ``install_database_connection``.
interactivetoolsproxy_map: "{{ interactivetools_db_connection }}"

# Prefix to use in the formation of the subdomain or path for
# interactive tools
Expand Down
6 changes: 3 additions & 3 deletions group_vars/sn06.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: "{{ interactivetools_db_connection }}"
gie_proxy_port: 8800
gie_proxy_verbose: true

Expand Down
6 changes: 3 additions & 3 deletions group_vars/sn07.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: "{{ interactivetools_db_connection }}"
gie_proxy_port: 8800
gie_proxy_verbose: true

Expand Down
74 changes: 41 additions & 33 deletions secret_group_vars/db-main.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,42 @@
$ANSIBLE_VAULT;1.1;AES256
32363835343162383736393837653534326237313362343234363037623661386634323939343839
6434343662383832613038643834396634376135633164660a623032383231383664666531393465
39616363313136373636616536616634313432363732306538366462383536373764316266626166
3339666466313036370a333337646531393166646666343963323734323630396366333162626638
39633139363435626337363235353364623731643965313830303239316265616165333838656562
39336461626130366139636664323762616330373032326562653630396233656337303966386139
36366161336563646666343438613834363734613861373737303165323838376564666361633937
65613833666638303433626537663563653538623962343537363033636166323038626236346262
31663830343532343430366231393139356264636134303131613132643435343834356336626437
37373934613035333333383836353762313866343733396133323133663635626561323437653038
32613236316362613436323961633666363639343135383862353764643639663837636538346162
37336136386263333534356162383638613761396462393265336339346264306465316565323561
66343239336562373137303538396230383836343831656535313063663137666365616434366337
39383337343266326263643637353033623032396461373439323661313134303266663263316635
32396362393935333963346237633239653936363263313239336130623039356565343034343435
32656533363864393463373839343662666562616233336262326463316333356262376365636464
64393931346532336438333564313838666432383434393531306563653335653166633565616137
32386438623061656434353430326630313736663237326265386133383461333930393266383234
64393433613832316533303661616334386136373336316137323636396530353365363263663966
33386233343630336562303062313362313364353762366633323136393264656239633561633761
39386338396132333862303530316339333531363066393637353263633663636365616261353639
63643038323062373964376562313139653333396661636265623435613963653966666661333763
38383663363532316636383961653338653864653361346131633364323863626566616265383238
33383865623531663135616561643530613932376532336534343139366433383334306434363364
38353964393466633635316262626339343333633636643265313562353432666262643130336638
30636264313131653264373237333062323637623439366632353933666330396165663466326533
62383762663332666432373262633737663365313063643838316163656533376439656438346430
66656462616437313430663364303434373738346636366439646563663237376532656439373166
31366436363866383638646435336461396665636430616365643563646566386565383435306566
38333331386439356264333534353934633035323232623233313935356238343765613362386638
64383261616466396532393834356263383662376539306662666437333938333434383531393033
39316137343738616166303861616136636638383338383035623138323437666630303965326237
6561
30343163336432356363396364356335373732366664356366653934623361373538653032383566
3065616462663065663464623332383663643534363738300a323939373733666539386132373366
37366262316235633030306536373363323736613130393135313137306238646137316632376132
3138306337396337640a636634633865333231616464366366306331646332643665613832333538
32363365313836313031363738656661373362613631363763353634636261386536623662323239
38343939646365353531366536396566313362316562666534306463326436333134636161316637
64363061346133653839316438626537663036346536613065363734646638373030643931643339
37303465346465353739306230363639376236393831363630636265306661316135613730653433
61613661346637363064336363303438313131633766663134633337666461626463343138623539
65656333343233353538313334326332353131656666393339663735363166393836326135653035
33323539323064633964656636323761313237386661353162323337396462353962663430326338
36356636666431336438336333663535636236386139643766313665663731623762623039386439
32613964616266643565386238326663656433616132333163333731666537366565663065393164
33346434633132613962363338313135383737303538363731326135636263383865636664633163
34336364313234326231636563633430646363623630356239653634363565386532613738353330
38636564393461303136643036346366313263303665333866623433316434633739373166633363
31336532616334663737323536306565363834353263623061376263653634626239623934316366
65646231353835643162636362363161313430323536653431333134316338313335623262346330
39363361376333633664326164316335666532646638646164636530666230393037666266663962
63323939326636643731333638393862323435386237636464613261633137666137386336626133
65396634616366326362626162643134383030666361323137393832346133346134303661616265
66373835313566363762343662623931336663353432303766323033373963626138363038346662
35353061303665373765653039346234373034306531633332393737353233323233383335646134
32393235373132356239653736353663636262376432616634346565323438653435326637656664
39356131343264613931386661306630636364626263623838346661613934303737306437363634
64613533373161303033613864616435306338336437666661623364656637323863643539376234
63623165616238633834386133383934373764306263666365333933386633653961323136376164
62313239396163396661613664666437643361303765303039356463646131663362333533363934
35343430616235626663656230306263643533623433386637633531663937363737323338303139
62306663613665353435323466623062653637663634353631323736326663313364623464313335
32643338343065353666383366633838396563303931303638383864303661303863663564646264
32653361353332653862633438343336363861386565393530643737396233626163316435366337
61366138336338653239613935326333303232333639626264346538323266346264643263396439
39383865656638346463386432376366623635613534386662376533323838643530653439616531
62656638633634326532623138393030316336383364663438636662333033633562386561653935
33313430373666613437653334356535633964323065653336633739333261303531653533323065
62666231633132623335333939376536376265323334663262363364303364613364623431353466
34343166396266613961313637393332643431366438653930303236653061643466346130343331
62643232323830316662303030613139326366636332333866393338616465363638363635336634
30353935633933303938316566656561643532383038356564626265366162666666323966386365
6366