Merge pull request #52 from martenson/more-uniform

work towards playbook uniformity of qa1, qa2, gcz
CESNET · Jan 16, 2025 · a009be5 · a009be5
2 parents 6179ff6 + bed094d
commit a009be5
Show file tree

Hide file tree

Showing 6 changed files with 146 additions and 144 deletions.
diff --git a/group_vars/galaxyservers.yml b/group_vars/galaxyservers.yml
@@ -135,7 +135,7 @@ galaxy_config:
     retry_job_output_collection: 3
     # Debugging
     allow_user_impersonation: true
-    log_level= "{{ csnt_log_level }}"
+    log_level: "{{ csnt_log_level }}"
     # Tool security
     outputs_to_working_directory: true
     new_user_dataset_access_role_default_private: true # Make datasets private by default

diff --git a/host_vars/galaxy-qa1.galaxy.cloud.e-infra.cz/vars.yml b/host_vars/galaxy-qa1.galaxy.cloud.e-infra.cz/vars.yml
@@ -1,7 +1,6 @@
 galaxy_commit_id: release_24.1
 
 csnt_brand: QA1-TEST
-csnt_enable_account_interface: false
 csnt_log_level: DEBUG
 
 pulsar:

diff --git a/host_vars/usegalaxy.cz/vars.yml b/host_vars/usegalaxy.cz/vars.yml
@@ -5,6 +5,8 @@ extra_certbot_domains:
 # where to put most of the data; we use RBD or NBD volumes
 galaxy_mutable_data_dir: /rbd/data
 
+galaxy_commit_id: release_23.0
+
 enable_flower: yes
 enable_telegraf: yes
 
@@ -21,6 +23,4 @@ pulsar_data_dir: "/storage/{{ pulsar.nfs_home }}/home/{{ pulsar.user_name }}/{{
 copy_tools_from: usegalaxy.eu
 
 admin_ssh_keys: |
-  ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCaGUfHM9igpBRvUtgx8Al1vfdJR4x6mx+ezXYX78m4ih9GTYJkeVHhgLqzLX+uQygO3Ugfz13eSn2bJj31HAJYt6aOf4H2tdg4G4GLcGuVPka2/CAzyNBPJ5fuY+hr9/zWJzU02xyQg/vjnqF7rOZK0VzTWJ3vTwa86uNEqa3T6TCViZJ2D7/LUZPkkIy/8zpcRBYNAz6XVkBezGiUYMKCODr5ROxunvy4H1VNdyeVfe3+mFPlwxfxHLAHmWjCFrvGpgFWO77l/0GD9iXSkhekjyq2t8HCj0GtebJdvTgh+k/4cjD4dxWD04t0mI7TyXyXe5jF7MVJM7xRcAwlV/2wNJIwCNBWh+kELUeYUbKaZsVi9Nx5DAsmq+A5mAXzzvXHxGh5AwtN08hcnpfqkxwywqgaQugK5CAO57LiqOyb+sR9vgK6awlhR1reavMCCErbwbbixSX2nZsu/iPxFGS04gwngHK8Mrg5HJhqzyxeQT8OmPGkWFNt62XVqbnE3a8= ljocha@abiff
-  ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCscnBHx46RNH0xgJGFQDuRvcjsf+0KE4lHMZuxhY3z70/kR3oJFZ0ns6/26QGCmhKVlSePKIO8idC1U5hqDXqhRB+Kpx/4yDcUNMtU4Xklmfqqv47uyq6/oylNjJgAbD691K21SZQSGP8nEz2LZlB3d9eNx131mVfMegyyQnnSLXqvQn1PGpwq9yCeV7RstAI67dL+ilglFWIUwkmwr7V6AKSPwYgFZE/uZJ0qfZ6+PBhS6+/zsDcq1N9OhtsHNsM1esglvWwu5zW83uuqB2p2FaG/Aoy3+70vDiwhjvgiXor/2jOx4Vzfv1c/55X8gmsOWT/WmQwoE2ernbFBFc8h [email protected]
   ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAfdMuyDmA84qskMECxjuep3V5tCAwPHYs10Qr5GQFR3wywJuarAVoFj4YR31mcmKR3ZkYRAOKJZepSGm11ojT9n5F+ctMrGhC5RmxlXhDF6RNadfx5QVkkRfldjkR4G+2iCtm4CA9bdSU57jQHtqXyyaw7+NqPiJmq6s+OIqCew6Mick+lCVCgwpbjm6Zg4E3fAYvxKPaB8fClpC+YM+wyBnG6dgq5Qb3qXMVrC0db1xpbQQbt91YWWzG6IAxFO/as1CRw/y4qS+60UlTjBp0umD5iK0ZDqfXI/aQrahOFZXQyobEGaiS1e8qcKEl+mFOxbkQpdXLZIdvgWrw6/LAS6i918lrOFrR/vtn67CP/yFwRqWcgXDRhlafmKL2LpKg61OsuJYP1fD4ccFyl+lTLs6yaR5i6HScbw5qtfWBYjFFdYRpiPw0YEPhFzwFsWRFB/FTxgjgVb0Ek+CWHRPTsRKCVtotUTgsAMO7mDvIre9y0ONkokS65bpGvBVMptk= action@github
diff --git a/templates/usegalaxy.cz/config/oidc_backends_config.xml.j2 b/templates/usegalaxy.cz/config/oidc_backends_config.xml.j2
@@ -6,12 +6,14 @@
         <redirect_uri>https://{{ inventory_hostname }}/authnz/keycloak/callback</redirect_uri>
         <url>https://login.e-infra.cz/oidc</url>
         <icon>https://www.e-infra.cz/img/logo.svg</icon>
+        <!-- <extra_scopes>offline_access</extra_scopes> -->
     </provider>
     <provider name="Elixir">
         <client_id>{{ elixir_client_id }}</client_id>
         <client_secret>{{ elixir_client_secret }}</client_secret>
         <redirect_uri>https://{{ inventory_hostname }}/authnz/elixir/callback</redirect_uri>
         <url>https://login.e-infra.cz/oidc</url>
         <icon>https://lifescience-ri.eu/fileadmin/lifescience-ri/media/Images/login-grey-wide.jpg.png</icon>
+        <!-- <extra_scopes>offline_access</extra_scopes> -->
     </provider>
 </OIDC>