Merge pull request #214 from martenson/shadow-cron

ensure shadow cron folder exists

Author: martenson

galaxy.yml

@@ -259,11 +259,22 @@
       when: "inventory_hostname in ['galaxy-qa1.galaxy.cloud.e-infra.cz', 'usegalaxy.cz', 'galaxy-umsa.grid.cesnet.cz']"
       no_log: true
 
+    # set up cron to propagate einfra users to einfra galaxy group
+    - name: Ensure the user_group cron script directory exists
+      ansible.builtin.file:
+        path: "{{ galaxy_root }}/cron/user_group"
+        state: directory
+        owner: postgres
+        group: postgres
+        mode: '0755'
+      when: "'usegalaxy.cz' in inventory_hostname"
+      tags: cron
     - name: Copy user - group association script
       ansible.builtin.copy:
         src: "{{ playbook_dir }}/extra_scripts/add_group_users.py"
-        dest: "/var/lib/postgresql/add_group_users.py"
+        dest: "{{ galaxy_root }}/cron/user_group/add_group_users.py"
         owner: postgres
+        group: postgres
       when: "'usegalaxy.cz' in inventory_hostname"
       tags: cron
     - name: Setup user - group association rutine
@@ -272,14 +283,24 @@
         user: postgres
         minute: "0"
         hour: "*" # every hour
-        job: "python3 /var/lib/postgresql/add_group_users.py {{ inventory_hostname }} $(cat /home/{{ galaxy_user_name }}/.galaxy_api_key)"
+        job: "python3 {{ galaxy_root }}/cron/user_group/add_group_users.py {{ inventory_hostname }} $(cat /home/{{ galaxy_user_name }}/.galaxy_api_key)"
       when: "'usegalaxy.cz' in inventory_hostname"
       tags: cron
 
+    # set up cron to shadow some shed_tools contents to minimize space consumption
+    - name: Ensure the shadow cron script directory exists
+      ansible.builtin.file:
+        path: "{{ galaxy_root }}/cron/shadow"
+        state: directory
+        owner: "{{ galaxy_user_name }}"
+        group: "{{ galaxy_user_group_name }}"
+        mode: '0755'
+      when: "shed_tools_shadowing"
+      tags: cron
     - name: Copy shed_tools shadowing script
       ansible.builtin.copy:
         src: "{{ playbook_dir }}/extra_scripts/shed_tools_shadow_script.sh"
-        dest: "{{ galaxy_root }}/scripts/shed_tools_shadow_script.sh"
+        dest: "{{ galaxy_root }}/cron/shadow/shed_tools_shadow_script.sh"
         owner: "{{ galaxy_user_name }}"
         group: "{{ galaxy_user_group_name }}"
         mode: '0755'
@@ -291,10 +312,11 @@
         user: "{{ galaxy_user_name }}"
         minute: "0"
         hour: "2" # 2 am daily
-        job: "{{ galaxy_root }}/scripts/shed_tools_shadow_script.sh {{ galaxy_root }}/var {{ galaxy_mutable_data_dir }} 2>&1 | logger -t shed_tools_shadowing"
+        job: "{{ galaxy_root }}/cron/shadow/shed_tools_shadow_script.sh {{ galaxy_root }}/var {{ galaxy_mutable_data_dir }} 2>&1 | logger -t shed_tools_shadowing"
       when: "shed_tools_shadowing"
       tags: cron
 
+    # set up cron to automate tool installation from https://github.com/CESNET/galaxy_tools repository
     - name: Ensure the tools cron script directory exists
       ansible.builtin.file:
         path: "{{ galaxy_root }}/cron/tools"
@@ -323,6 +345,7 @@
       tags: cron
       when: "inventory_hostname in ['galaxy-qa1.galaxy.cloud.e-infra.cz', 'usegalaxy.cz', 'galaxy-umsa.grid.cesnet.cz']"
 
+
     - name: RE Galaxy instance patch in lib/galaxy/webapps/galaxy/api/job_files.py
       replace:
         path: "{{ galaxy_root }}/server/lib/galaxy/webapps/galaxy/api/job_files.py"
@@ -343,6 +366,7 @@
         user: "{{ galaxy_user_name }}"
         state: present
         key: "{{ lookup('file','files/{{ inventory_hostname }}/pulsar.pub') }}"
+
     - name: Restart galaxy
       become: true
       become_user: root