Lint code

Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>

diff --git a/.salt-lint b/.salt-lint
index 469c14e4deb814e9ef3f76f2466d7f0d347a972d..cfa12cf9069f1792924257b36be662eeec2e74de 100644 (file)
--- a/.salt-lint
+++ b/.salt-lint
@@ -6,6 +6,7 @@ rules:
   204:  # Lines should be no longer that 160 chars
     ignore: |
       arvados/shell/config/files/default/shell-libpam-arvados.tmpl.jinja
+      arvados/shell/config/files/default/shell-pam-shellinabox.tmpl.jinja
       test/salt/pillar/examples/nginx_webshell_configuration.sls
       test/salt/pillar/examples/nginx_passenger.sls
 skip_list:

diff --git a/pillar.example b/pillar.example
index 78676f16fddc217e34edb8ec17571ba1d3921853..2347f57baf14d45bb40b22513174cd8096224501 100644 (file)
--- a/pillar.example
+++ b/pillar.example
@@ -132,8 +132,10 @@ arvados:
     # this formula. The following dict is just an example that will be used
     # by the `arvados.api.resources.virtual_machines` state to add entries
     # in Arvados' database of the cluster's resources'
-    # It's additionally used in the `test/salt/pillar/examples/nginx_webshell_configuration.sls`
-    # pillar to add the corresponding `location` entries in nginx's webshell vhosts & upstreams
+    # It's additionally used in the
+    #   `test/salt/pillar/examples/nginx_webshell_configuration.sls`
+    # pillar to add the corresponding `location` entries in nginx's webshell
+    # vhosts & upstreams
     resources:
       virtual_machines:
         shell1: