Salt
/
users-formula
mirror of https://github.com/saltstack-formulas/users-formula.git
0
0
Fork 0
Code Issues Activity

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"
```
This commit is contained in:
Imran Iqbal 2019-10-09 18:56:37 +01:00
parent 23b6725e4f
commit bb27b940ea
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
users/googleauth.sls
View File

@ -6,7 +6,7 @@ users_googleauth-package:
pkg.installed: pkg.installed:
- name: {{ users.googleauth_package }} - name: {{ users.googleauth_package }}
- require: - require:
- file: {{ users.googleauth_dir }} - file: {{ users.googleauth_dir }}
users_{{ users.googleauth_dir }}: users_{{ users.googleauth_dir }}:
file.directory: file.directory:
@ -19,11 +19,23 @@ users_{{ users.googleauth_dir }}:
{%- if 'google_auth' in user %} {%- if 'google_auth' in user %}
{%- for svc in user['google_auth'] %} {%- for svc in user['google_auth'] %}
{%- if user.get('google_2fa', True) %} {%- 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 }}: users_googleauth-pam-{{ svc }}-{{ name }}:
file.replace: file.replace:
- name: /etc/pam.d/{{ svc }} - name: /etc/pam.d/{{ svc }}
- pattern: "^@include common-auth" - 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 }} - unless: grep pam_google_authenticator.so /etc/pam.d/{{ svc }}
- backup: .bak - backup: .bak
{%- endif %} {%- endif %}