Merge branch 'main' of github.com:CESNET/usegalaxy into main

Author: martindemko

galaxy.yml

@@ -116,6 +116,29 @@
         owner: "999"
         mode: "0400"
 
+- hosts: cloudservers
+  become: true
+  tasks:
+    - name: Ensure docker.json starts with {
+      lineinfile:
+        path: /etc/docker/daemon.json
+        line: '{'
+        state: present
+        create: yes
+        insertafter: BOF
+    - name: Ensure docker.json contains proper mtu
+      lineinfile:
+        path: /etc/docker/daemon.json
+        line: '    "mtu": 1442,'
+        insertafter: '^{.*'
+        state: present
+    - name: Ensure docker.json ends with }
+      lineinfile:
+        path: /etc/docker/daemon.json
+        line: '}'
+        state: present
+        insertbefore: EOF
+
 - hosts: galaxyservers
   become: true
   become_user: root

group_vars/galaxyservers.yml

@@ -1,6 +1,7 @@
 ---
 # defaults for host-specific vars
 csnt_brand: ""
+csnt_contact_email: "galaxy@cesnet.cz"
 csnt_short_term_storage_dir: short_term_web_storage
 csnt_enable_account_interface: true
 csnt_log_level: WARNING
@@ -118,7 +119,7 @@ galaxy_config:
     admin_users: "{{ vault_admin_users }}"
     cleanup_job: onsuccess
     smtp_server: "rs.cesnet.cz:25"
-    error_email_to: "regalaxy@rt.cesnet.cz"
+    error_email_to: "{{  csnt_contact_email  }}"
     allow_user_creation: false
     require_login: true
     database_connection: "postgresql:///{{ galaxy_db_name }}?host=/var/run/postgresql"
@@ -443,7 +444,7 @@ tiaas_admin_pass: "{{ tiaas_password }}"
 tiaas_info:
   owner: "Metacentrum"
   domain: "{{ inventory_hostname }}"
-  owner_email: "regalaxy@rt.cesnet.cz"
+  owner_email: "{{ csnt_contact_email  }}"
   owner_site: "https://{{ inventory_hostname }}"
 tiaas_send_email_to_requester: true
 tiaas_send_email_to: "{{ tiaas_info.owner_email }}"

hosts.yml

@@ -18,3 +18,10 @@ production:
       ansible_user: galaxy-cz
     galaxy-umsa.grid.cesnet.cz:
       ansible_user: galaxy
+
+cloudservers:
+  hosts:
+    galaxy-qa1.galaxy.cloud.e-infra.cz:
+      ansible_user: debian
+    galaxy-qa2.galaxy.cloud.e-infra.cz:
+      ansible_user: debian

templates/galaxy-qa1.galaxy.cloud.e-infra.cz/static/welcome.html

@@ -44,7 +44,7 @@ <h1>QA1 Test Instance</h1>
                     class="reference">Documentation</a>
                 for details about using this service. In case of any further
                 questions, please contact us at
-                <a href="mailto:regalaxy@rt.cesnet.cz" target="_blank">regalaxy@rt.cesnet.cz</a>.
+                <a href="mailto:galaxy@cesnet.cz" target="_blank">galaxy@cesnet.cz</a>.
             </p>
             <p>Have a look at one of our <a target="_blank" href="https://training.galaxyproject.org/">trainings</a> or
                 you can start with an interactive tour:

templates/galaxy-qa2.galaxy.cloud.e-infra.cz/static/welcome.html

@@ -42,7 +42,7 @@ <h1>QA2 TEST</h1>
                     class="reference">Documentation</a>
                 for details about using this service. In case of any further
                 questions, please contact us at
-                <a href="mailto:regalaxy@rt.cesnet.cz" target="_blank">regalaxy@rt.cesnet.cz</a>.
+                <a href="mailto:galaxy@cesnet.cz" target="_blank">galaxy@cesnet.cz</a>.
             </p>
             <p>You can start with an interactive tour:
             <div>

templates/usegalaxy.cz/static/welcome.html

@@ -44,7 +44,7 @@
                     class="reference">Documentation</a>
                 for details about using this service. In case of any further
                 questions, please contact us at
-                <a href="mailto:regalaxy@rt.cesnet.cz" target="_blank">regalaxy@rt.cesnet.cz</a>.
+                <a href="mailto:galaxy@cesnet.cz" target="_blank">galaxy@cesnet.cz</a>.
             </p>
             <p>Have a look at one of our <a target="_blank" href="https://training.galaxyproject.org/">trainings</a> or
                 you can start with an interactive tour: