From bb27b940ead669a81bf0433f3765547bf997dbc5 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 9 Oct 2019 18:56:37 +0100 Subject: [PATCH] fix(googleauth.sls): fix `salt-lint` errors ```bash Examining users/googleauth.sls of type state [201] Trailing whitespace users/googleauth.sls:9 - file: {{ users.googleauth_dir }} [204] Lines should be no longer that 160 chars users/googleauth.sls:26 - repl: "auth [success=done new_authtok_reqd=done default=die] pam_google_authenticator.so user=root secret={{ users.googleauth_dir }}/${USER}_{{ svc }} echo_verification_code\n@include common-auth" ``` --- users/googleauth.sls | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/users/googleauth.sls b/users/googleauth.sls index 3f59c8f5..22e50654 100644 --- a/users/googleauth.sls +++ b/users/googleauth.sls @@ -6,7 +6,7 @@ users_googleauth-package: pkg.installed: - name: {{ users.googleauth_package }} - require: - - file: {{ users.googleauth_dir }} + - file: {{ users.googleauth_dir }} users_{{ users.googleauth_dir }}: file.directory: @@ -19,11 +19,23 @@ users_{{ users.googleauth_dir }}: {%- if 'google_auth' in user %} {%- for svc in user['google_auth'] %} {%- if user.get('google_2fa', True) %} +{%- set repl = '{0} {1} {2} {3} {4}{5}/{6}_{7} {8}\n{9}'.format( + 'auth', + '[success=done new_authtok_reqd=done default=die]', + 'pam_google_authenticator.so', + 'user=root', + 'secret=', + users.googleauth_dir, + '${USER}', + svc, + 'echo_verification_code', + '@include common-auth', + ) %} users_googleauth-pam-{{ svc }}-{{ name }}: file.replace: - name: /etc/pam.d/{{ svc }} - pattern: "^@include common-auth" - - repl: "auth [success=done new_authtok_reqd=done default=die] pam_google_authenticator.so user=root secret={{ users.googleauth_dir }}/${USER}_{{ svc }} echo_verification_code\n@include common-auth" + - repl: "{{ repl }}" - unless: grep pam_google_authenticator.so /etc/pam.d/{{ svc }} - backup: .bak {%- endif %}