From ea03991ffd010f914ed016021e393a47654f8c8b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Wed, 5 May 2021 16:27:06 -0300 Subject: [PATCH 1/1] fix(shellinabox): renamed pam file also removed the messed `libpam-arvados-go` references, as they were not functional as they were written. --- arvados/defaults.yaml | 3 --- arvados/shell/config/clean.sls | 4 ++-- arvados/shell/config/file.sls | 8 ++++---- ...s.tmpl.jinja => shell-pam-shellinabox.tmpl.jinja} | 0 arvados/shell/package/install.sls | 1 - pillar.example | 5 +---- test/integration/shell/controls/config_spec.rb | 12 ++++++------ test/integration/shell/controls/packages_spec.rb | 1 - 8 files changed, 13 insertions(+), 21 deletions(-) rename arvados/shell/config/files/default/{shell-libpam-arvados.tmpl.jinja => shell-pam-shellinabox.tmpl.jinja} (100%) diff --git a/arvados/defaults.yaml b/arvados/defaults.yaml index d737ee4..07780b6 100644 --- 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 caceeca..1c7848c 100644 --- 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 c20ef99..e8bf644 100644 --- 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 b1ad75e..c5d4206 100644 --- 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 4105b66..e5278dd 100644 --- 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 f0e8a7e..54852fa 100644 --- 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 .' + 'File managed by Salt at .' # 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 0b69de9..50fd1a5 100644 --- 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 -- 2.30.2