fix conf_options to yaml

abims-sbr · Aug 5, 2024 · f671ecd · f671ecd
1 parent df158e6
commit f671ecd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -12,7 +12,7 @@
         port: '4567'
         path: '/tmp/test-data'
         placeholders: [{key: 'key_string', value: 'value1'}, {key: 'key_link', value: '<a href="http://testplaceholder.com">my favorite link</a>'}]
-        conf_options: [{key: 'job_lifetime', value: '10080'}, {key: 'databases_widget', value: 'tree'}, {key: 'options', value: {':blastn:': {':default:': ["-task blastn", "-evalue 1e-5"], ':short-seq:': ["-task blastn-short", "-evalue 1e-1"]}}}]
+        conf_options: {':job_lifetime:': '10080', ':databases_widget:': 'tree', ':options:': {':blastn:': {':default:': ["-task blastn", "-evalue 1e-5"], ':short-seq:': ["-task blastn-short", "-evalue 1e-1"]}}}
     sequenceserver_top_web_page_html_path: "/tmp/top_web_page.html"
     sequenceserver_bottom_web_page_html_path: "/tmp/bottom_web_page.html"
     sequenceserver_home_url: "http://myfavoritewebsite.com"

diff --git a/templates/sequenceserver.conf.j2 b/templates/sequenceserver.conf.j2
@@ -1,9 +1,5 @@
 :port: '{{ item.port }}'
 :database_dir: '{{ item.path }}'
 {% if item.conf_options is defined and item.conf_options %}
-{% for option in item.conf_options %}
-{% if option.key is defined and option.key and option.value is defined and option.value %}
-:{{ option.key }}: '{{ option.value | to_yaml }}'
-{% endif %}
-{% endfor %}
+{{ conf_options | to_yaml }}
 {% endif %}