fix(shellinabox): renamed pam file

also removed the messed `libpam-arvados-go` references, as they
were not functional as they were written.

diff --git a/arvados/defaults.yaml b/arvados/defaults.yaml
index d737ee487e17490a35a09ff5bc923aeb9ca2bdeb..07780b686eb745c03722fa4fe76ec947293f2ba3 100644 (file)
--- a/arvados/defaults.yaml
+++ b/arvados/defaults.yaml
@@ -115,7 +115,6 @@ arvados:
       name:
         - arvados-client
         - arvados-src
-        - libpam-arvados-go
         - python3-arvados-fuse
         - python3-arvados-python-client
         - python3-arvados-cwl-runner
@@ -129,8 +128,6 @@ arvados:
       service:
         name: shellinabox
         port: 4200
-    libpam_arvados:
-      config: /etc/pam.d/arvados
 
   ##### WORKBENCH
   workbench:

diff --git a/arvados/shell/config/clean.sls b/arvados/shell/config/clean.sls
index caceeca50cf77b133b9fc3133418d99c33f2917e..1c7848cdd662e915005e56fa7ddab49ef618e13d 100644 (file)
--- a/arvados/shell/config/clean.sls
+++ b/arvados/shell/config/clean.sls
@@ -11,8 +11,8 @@ arvados-shell-config-clean-file-shellinabox-absent:
     - watch_in:
         - sls: {{ sls_service_clean }}
 
-arvados-shell-config-clean-file-libpam-arvados-absent:
+arvados-shell-config-clean-file-pam-shellinabox-absent:
   file.absent:
-    - name: {{ arvados.shell.libpam-arvados.config }}
+    - name: /etc/pam.d/shellinabox
     - watch_in:
         - sls: {{ sls_service_clean }}

diff --git a/arvados/shell/config/file.sls b/arvados/shell/config/file.sls
index c20ef99722b94b94a41e6fcae2d08603a69c0671..e8bf64425edbf9060b20eaa7689292bef3aa1ae8 100644 (file)
--- a/arvados/shell/config/file.sls
+++ b/arvados/shell/config/file.sls
@@ -28,11 +28,11 @@ arvados-shell-config-file-shellinabox-file-managed:
     - context:
         arvados: {{ arvados | json }}
 
-arvados-shell-config-file-libpam-arvados-file-managed:
+arvados-shell-config-file-pam-shellinabox-file-managed:
   file.managed:
-    - name: {{ arvados.shell.libpam_arvados.config }}
-    - source: {{ files_switch(['shell-libpam-arvados.tmpl.jinja'],
-                              lookup='arvados-shell-config-file-libpam-arvados-file-managed',
+    - name: /etc/pam.d/shellinabox
+    - source: {{ files_switch(['shell-pam-shellinabox.tmpl.jinja'],
+                              lookup='arvados-shell-config-file-pam-shellinabox-file-managed',
                               use_subpath=True
                  )
               }}

diff --git a/arvados/shell/config/files/default/shell-libpam-arvados.tmpl.jinja b/arvados/shell/config/files/default/shell-pam-shellinabox.tmpl.jinja
similarity index 100%
rename from arvados/shell/config/files/default/shell-libpam-arvados.tmpl.jinja
rename to arvados/shell/config/files/default/shell-pam-shellinabox.tmpl.jinja

diff --git a/arvados/shell/package/install.sls b/arvados/shell/package/install.sls
index b1ad75ee68a468d76663337ac84b21e4ce1595c3..c5d4206585b2e0e28c16c9c080ba347111172a04 100644 (file)
--- a/arvados/shell/package/install.sls
+++ b/arvados/shell/package/install.sls
@@ -21,7 +21,6 @@ arvados-shell-package-install-pkg-installed:
         {%- if package in [
           'arvados-client',
           'arvados-src',
-          'libpam-arvados-go',
           'python3-arvados-fuse',
           'python3-arvados-python-client',
           'python3-arvados-cwl-runner',

diff --git a/pillar.example b/pillar.example
index 4105b66ce3c4673b6d4150503a8c87442d58d8d7..e5278ddd07b63617e18f0b6511684394e8288ed2 100644 (file)
--- a/pillar.example
+++ b/pillar.example
@@ -48,7 +48,7 @@ arvados:
   #   file: /etc/arvados/config.yml
   #   user: root
   ### IMPORTANT!!!!!
-  ### If you're intalling any of the rails apps (api, workbench), the group
+  ### If you're installing any of the rails apps (api, workbench), the group
   ### should be set to that of the web server, usually `www-data`
   #   group: root
   #   mode: 640
@@ -238,7 +238,6 @@ arvados:
 #       name:
 #         - arvados-client
 #         - arvados-src
-#         - libpam-arvados-go
 #         - python3-arvados-fuse
 #         - python3-arvados-python-client
 #         - python3-arvados-cwl-runner
@@ -251,8 +250,6 @@ arvados:
 #       service:
 #         name: shellinabox
 #         port: 4200
-#     libpam_arvados:
-#       config: /etc/pam.d/arvados
 #  #### WORKBENCH
 #   workbench:
 #     pkg:

diff --git a/test/integration/shell/controls/config_spec.rb b/test/integration/shell/controls/config_spec.rb
index f0e8a7ef14b3765f71680af5fc59bc0d8dd2f8f4..54852fa5a19f930387f52390ae18dd594907bbdd 100644 (file)
--- a/test/integration/shell/controls/config_spec.rb
+++ b/test/integration/shell/controls/config_spec.rb
@@ -45,14 +45,14 @@ control 'shellinabox configuration' do
   end
 end
 
-control 'libpam-arvados configuration' do
+control 'pam-shellinabox-arvados configuration' do
   title 'should match desired lines'
 
-  libpam_stanza = <<~LIBPAM_STANZA
+  pamshellinabox_stanza = <<~PAMSHELLINABOX_STANZA
     auth [success=1 default=ignore] /usr/lib/pam_arvados.so fixme.example.net shell.fixme.example.net
-  LIBPAM_STANZA
+  PAMSHELLINABOX_STANZA
 
-  describe file('/etc/pam.d/arvados') do
+  describe file('/etc/pam.d/shellinabox') do
     it { should be_file }
     it { should be_owned_by 'root' }
     it { should be_grouped_into 'root' }
@@ -60,10 +60,10 @@ control 'libpam-arvados configuration' do
     its('content') do
       should include(
         # rubocop:disable Layout/LineLength
-        'File managed by Salt at <salt://arvados/shell/config/files/default/shell-libpam-arvados.tmpl.jinja>.'
+        'File managed by Salt at <salt://arvados/shell/config/files/default/shell-pam-shellinabox.tmpl.jinja>.'
         # rubocop:enable Layout/LineLength
       )
     end
-    its('content') { should include(libpam_stanza) }
+    its('content') { should include(pamshellinabox_stanza) }
   end
 end

diff --git a/test/integration/shell/controls/packages_spec.rb b/test/integration/shell/controls/packages_spec.rb
index 0b69de9fceb9d2953df327de3a0fdf5377b66f27..50fd1a5f18cbec51ca614ff974be4033285d5b44 100644 (file)
--- a/test/integration/shell/controls/packages_spec.rb
+++ b/test/integration/shell/controls/packages_spec.rb
@@ -3,7 +3,6 @@
 packages_list = %w[
   arvados-client
   arvados-src
-  libpam-arvados-go
   python3-arvados-fuse
   python3-arvados-python-client
   python3-arvados-cwl-runner