Skip to content

Commit

Permalink
fix(googleauth.sls): fix salt-lint errors
Browse files Browse the repository at this point in the history
```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"
```
  • Loading branch information
myii committed Oct 9, 2019
1 parent 23b6725 commit bb27b94
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions users/googleauth.sls
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 %}
Expand Down

0 comments on commit bb27b94

Please sign in to comment.