From 5cb9ed835ef9d07f0ff50572dd97c0133de3a354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Loraine=20Gu=C3=A9guen?= Date: Tue, 28 Mar 2023 12:20:05 +0200 Subject: [PATCH] remove spaces --- README.md | 6 +++--- defaults/main.yml | 4 ++-- molecule/default/converge.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ad644b0..a9851b2 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ sequenceserver_blast_db: path: '/path/to/my/db' users: ['fbar','jsmith'] web_page_title: 'blablabla' - placeholders: [{key: 'key1', value: 'value1'}, {key: 'key2', value: 'value2'}] + placeholders: [{key: 'key1',value: 'value1'}, {key: 'key2',value: 'value2'}] ``` This is the variable used to define the BLAST databases. @@ -51,7 +51,7 @@ Each database is defined as a dictionary of the following parameters: - `users` Optional. Useful if the database needs restricted access. List of authorized users (LDAP "uid"). - `ldap_businesscategory` Optional. Useful if the database needs restricted access. A ldap businessCategory value. LDAP users with this "businessCategory" value will have access to the database. - `web_page_title` Optional. The title displayed at the top of the web page. If not provided, the default title is "BLAST server for `name`". -- `placeholders` Optional. A list of placeholder dictionaries `{key: 'key_item', value: 'value_item'}` that are used to customize top or bottom supplementary HTML code (see `sequenceserver_top_web_page_html_path` and `sequenceserver_bottom_web_page_html_path`). For example `placeholders: [{key: 'key1', value: 'value1'}, {key: 'key2', value: 'value2'}]`. +- `placeholders` Optional. A list of placeholder dictionaries `{key: 'key_item', value: 'value_item'}` that are used to customize top or bottom supplementary HTML code (see `sequenceserver_top_web_page_html_path` and `sequenceserver_bottom_web_page_html_path`). For example `placeholders: [{key: 'key1',value: 'value1'}, {key: 'key2',value: 'value2'}]`. Unique `name` and `port` are mandatory for each database. `users` and `ldap_businesscategory` are optional and can be used to add an authentication layer with the nginx-auth-ldap module. It is planned to add a `groups` parameter soon to list authorized groups. @@ -88,7 +88,7 @@ sequenceserver_bottom_web_page_html_path: "~/bottom_web_page.html" These variables allow to customize the BLAST server web page. They are optional. Two variables are available to set the logo displayed on the BLAST server: `sequenceserver_logo_url` or `sequenceserver_logo_path`. If both are set, the logo given with `sequenceserver_logo_path` will override the logo given with `sequenceserver_logo_url`. If the files `sequenceserver_top_web_page_html_path` or `sequenceserver_bottom_web_page_html_path` exist, their content will be added in the base RUBY template used to display the web page and will be rendered at the top and bottom of the web page. These files must contain HTML code. This can be used, for example, to display information or warning messages to users (service shutdown, etc). -Placeholders set in the database parameter `placeholders` (see above) can be used to customize the HTML code in these files. For example, if the database has the parameter `placeholders: [{key: 'key_item', value: 'value_item'}]`, the snippet `<% if defined?(SequenceServer::Key_item) %><%= SequenceServer::Key_item %>` will be replaced by the string `value_item` in the rendered HTML code. Please note that the first letter must be upper case in the snippet to be correctly interpreted as a Ruby constant by SequenceServer. +Placeholders set in the database parameter `placeholders` (see above) can be used to customize the HTML code in these files. For example, if the database has the parameter `placeholders: [{key: 'key_item',value: 'value_item'}]`, the snippet `<% if defined?(SequenceServer::Key_item) %><%= SequenceServer::Key_item %>` will be replaced by the string `value_item` in the rendered HTML code. Please note that the first letter must be upper case in the snippet to be correctly interpreted as a Ruby constant by SequenceServer. ```yaml # User running the sequenceserver service (systemd) and running SLURM blast jobs diff --git a/defaults/main.yml b/defaults/main.yml index 5caeb11..2e801be 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -15,7 +15,7 @@ sequenceserver_version: 2.0.0 # groups: TODO. Optional. Useful if the database needs restricted access. List of authorized groups. # ldap_businesscategory: Optional. Useful if the database needs restricted access. A ldap businessCategory value. Ldap users with this businessCategory value will have access to the database. # web_page_title: Optional. The title displayed at the top of the web page. If not provided, the default title is "BLAST server for ". -# placeholders: Optional. A list of placeholder dictionaries `{key: 'key_item', value: 'value_item'}` that are used to customize top or bottom supplementary HTML code (`sequenceserver_top_web_page_html_path` and `sequenceserver_bottom_web_page_html_path`) +# placeholders: Optional. A list of placeholder dictionaries `{key: 'key_item',value: 'value_item'}` that are used to customize top or bottom supplementary HTML code (`sequenceserver_top_web_page_html_path` and `sequenceserver_bottom_web_page_html_path`) # sequenceserver_blast_db: # - name: 'my_db' @@ -23,7 +23,7 @@ sequenceserver_blast_db: # path: '/path/to/my/db' # users: ['fbar','jsmith'] # web_page_title: 'blablabla' -# placeholders: [{ key: 'key1', value: 'value1'}, { key: 'key2', value: 'value2'}] +# placeholders: [{key: 'key1',value: 'value1'}, {key: 'key2',value: 'value2'}] # NCBI BLAST and SLURM variables # Used in the slurm bash scripts diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 4f2a25b..d3adc33 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -11,7 +11,7 @@ - name: 'my_db' port: '4567' path: '/tmp/test-data' - placeholders: [{ key: 'key_string', value: 'value1'}, { key: 'key_link', value: 'my favorite link'}] + placeholders: [{key: 'key_string',value: 'value1'}, {key: 'key_link',value: 'my favorite link'}] 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"