extract config style (ini or yml) from galaxy_config_file as suggeste…

…d by nuwang

defaults/main.yml

@@ -66,10 +66,7 @@ galaxy_server_dir: /mnt/galaxy/galaxy-app
 galaxy_venv_dir: "{{ galaxy_server_dir }}/.venv"
 
 # A system path for Galaxy's main configuration file
-# Galaxy config file can either be 'ini-paste' (old style) or 'yaml'
-galaxy_config_style: "ini-paste"
-galaxy_config_file_basename: "galaxy.{{ 'yml' if galaxy_config_style in ('yaml', 'yml') else 'ini' }}"
-galaxy_config_file: "{{ galaxy_server_dir }}/config/{{ galaxy_config_file_basename }}"
+galaxy_config_file: "{{ galaxy_server_dir }}/config/galaxy.ini"
 
 ## Set this to 'yes' if you are targeting galaxy in a docker container
 galaxy_runs_in_docker: no

tasks/bootstrap_user.yml

@@ -25,13 +25,13 @@
 
 - name: Set bootstrap user as Galaxy Admin with config file in ini-paste style
   lineinfile: dest={{ galaxy_config_file }} state=present insertafter="app:main" regexp="^[ ]*admin_users[ ]*=[ ]*" line="admin_users = {{ galaxy_tools_admin_user }}"  #"
-  when: (create_user is defined) and create_user and (admin_users_found.msg == "") and (galaxy_config_style == "ini-paste")
+  when: (create_user is defined) and create_user and (admin_users_found.msg == "") and ('.ini' in {{ galaxy_config_file }})
   notify:
     - ansible-galaxy-tools restart galaxy
 
 - name: Set bootstrap user as Galaxy Admin with config file in yaml style
   lineinfile: dest={{ galaxy_config_file }} state=present regexp='^([ ]*)admin_users[ ]*{{ ":" }}.*' line='    admin_users{{ ":" }} {{ galaxy_tools_admin_user }}'
-  when: (create_user is defined) and create_user and (admin_users_found.msg == "") and (galaxy_config_style == "yaml" or galaxy_config_style == "yml")
+  when: (create_user is defined) and create_user and (admin_users_found.msg == "") and ('.yml' in {{ galaxy_config_file }})
   notify:
     - ansible-galaxy-tools restart galaxy