Skip to content

Commit 901694c

Browse files
thicanthesamesam
thican
authored and
thesamesam
committed
templates/*: replace groups of spaces by tabulations
Signed-off-by: Thibaud CANALE <thican@thican.net> Closes: #23 Signed-off-by: Sam James <sam@gentoo.org>
1 parent 8f0e1b1 commit 901694c

14 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎templates/other.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
auth required pam_deny.so
22
account required pam_deny.so
3-
password required pam_deny.so
3+
password required pam_deny.so
44
session required pam_deny.so

‎templates/system-auth.tpl‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ auth sufficient pam_ssh.so
44
{% endif %}
55

66
{% if krb5 %}
7-
auth [success={{ 4 if homed else 3 }} default=ignore] pam_krb5.so {{ krb5_params }}
7+
auth [success={{ 4 if homed else 3 }} default=ignore] pam_krb5.so {{ krb5_params }}
88
{% endif %}
99

1010
{% if sssd %}
@@ -15,13 +15,13 @@ auth [default=3 ignore=ignore success=ok] pam_localuser.so
1515
auth requisite pam_faillock.so preauth
1616

1717
{% if homed %}
18-
auth [success=2 default=ignore] pam_systemd_home.so
18+
auth [success=2 default=ignore] pam_systemd_home.so
1919
{% endif %}
2020

2121
{% if sssd %}
22-
auth sufficient pam_unix.so {{ nullok|default('', true) }} {{ debug|default('', true) }}
22+
auth sufficient pam_unix.so {{ nullok|default('', true) }} {{ debug|default('', true) }}
2323
{% else %}
24-
auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so {{ nullok|default('', true) }} {{ debug|default('', true) }} try_first_pass
24+
auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so {{ nullok|default('', true) }} {{ debug|default('', true) }} try_first_pass
2525
{% endif %}
2626
auth [default=die] pam_faillock.so authfail
2727
{% if sssd %}
@@ -38,15 +38,15 @@ account [success=2 default=ignore] pam_krb5.so {{ krb5_params }}
3838
{% endif %}
3939

4040
{% if homed %}
41-
account [success={{ 2 if sssd else 1 }} default=ignore] pam_systemd_home.so
41+
account [success={{ 2 if sssd else 1 }} default=ignore] pam_systemd_home.so
4242
{% endif %}
4343

4444
account required pam_unix.so {{ debug|default('', true) }}
45-
account required pam_faillock.so
45+
account required pam_faillock.so
4646
{% if sssd %}
4747
account sufficient pam_localuser.so
4848
account sufficient pam_usertype.so issystem
49-
account [default=bad success=ok user_unknown=ignore] pam_sss.so {{ debug|default('', true) }}
49+
account [default=bad success=ok user_unknown=ignore] pam_sss.so {{ debug|default('', true) }}
5050
account required pam_permit.so
5151
{% endif %}
5252

@@ -55,25 +55,25 @@ password required pam_passwdqc.so config=/etc/security/passwdqc.conf
5555
{% endif %}
5656

5757
{% if pwquality %}
58-
password required pam_pwquality.so {{ local_users_only|default('', true ) }}
58+
password required pam_pwquality.so {{ local_users_only|default('', true ) }}
5959
{% endif %}
6060

6161
{% if pwhistory %}
62-
password required pam_pwhistory.so use_authtok remember=5 retry=3
62+
password required pam_pwhistory.so use_authtok remember=5 retry=3
6363
{% endif %}
6464

6565
{% if krb5 %}
6666
password [success=1 default=ignore] pam_krb5.so {{ krb5_params }}
6767
{% endif %}
6868

6969
{% if homed %}
70-
password [success=1 default=ignore] pam_systemd_home.so
70+
password [success=1 default=ignore] pam_systemd_home.so
7171
{% endif %}
7272

7373
{% if passwdqc or pwquality %}
7474
password {{ 'sufficient' if sssd else 'required' }} pam_unix.so try_first_pass {{ unix_authtok|default('', true) }} {{ nullok|default('', true) }} {{ unix_extended_encryption|default('', true) }} {{ debug|default('', true) }}
7575
{% else %}
76-
password {{ 'sufficient' if sssd else 'required' }} pam_unix.so try_first_pass {{ nullok|default('', true) }} {{ unix_extended_encryption|default('', true) }} {{ debug|default('', true) }}
76+
password {{ 'sufficient' if sssd else 'required' }} pam_unix.so try_first_pass {{ nullok|default('', true) }} {{ unix_extended_encryption|default('', true) }} {{ debug|default('', true) }}
7777
{% endif %}
7878

7979
{% if sssd %}

‎templates/system-login.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ session required pam_selinux.so close
1818
session required pam_env.so envfile=/etc/profile.env {{ debug|default('', true) }}
1919
session include system-auth
2020
{% if selinux %}
21-
# Note: modules that run in the user's context must come after this line.
21+
# Note: modules that run in the user's context must come after this line.
2222
session required pam_selinux.so multiple open
2323
{% endif %}
2424

‎templates/system-services.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
auth sufficient pam_permit.so
22
account include system-auth
3-
session optional pam_loginuid.so
3+
session optional pam_loginuid.so
44
{% include "templates/system-session.tpl" %}

‎templates/system-session.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ session [success=1 default=ignore] pam_krb5.so {{ krb5_params }}
99
{% endif %}
1010

1111
{% if homed %}
12-
session [success=1 default=ignore] pam_systemd_home.so
12+
session [success=1 default=ignore] pam_systemd_home.so
1313
{% endif %}
1414

1515
session required pam_unix.so {{ debug|default('', true) }}

‎tests/rendered/custom/other‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
auth required pam_deny.so
22
account required pam_deny.so
3-
password required pam_deny.so
3+
password required pam_deny.so
44
session required pam_deny.so

‎tests/rendered/custom/system-auth‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
auth required pam_env.so
22
auth requisite pam_faillock.so preauth
3-
auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so nullok try_first_pass
3+
auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so nullok try_first_pass
44
auth [default=die] pam_faillock.so authfail
55
account required pam_unix.so
6-
account required pam_faillock.so
6+
account required pam_faillock.so
77
password required pam_passwdqc.so config=/etc/security/passwdqc.conf
88
password required pam_unix.so try_first_pass use_authtok nullok sha512 shadow
99
session required pam_limits.so

‎tests/rendered/custom/system-services‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
auth sufficient pam_permit.so
22
account include system-auth
3-
session optional pam_loginuid.so
3+
session optional pam_loginuid.so
44
session required pam_limits.so
55
session required pam_env.so
66
session required pam_unix.so

‎tests/rendered/default/other‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
auth required pam_deny.so
22
account required pam_deny.so
3-
password required pam_deny.so
3+
password required pam_deny.so
44
session required pam_deny.so

‎tests/rendered/default/system-auth‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
auth required pam_env.so
22
auth requisite pam_faillock.so preauth
3-
auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so try_first_pass
3+
auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so try_first_pass
44
auth [default=die] pam_faillock.so authfail
55
account required pam_unix.so
6-
account required pam_faillock.so
7-
password required pam_unix.so try_first_pass md5 shadow
6+
account required pam_faillock.so
7+
password required pam_unix.so try_first_pass md5 shadow
88
session required pam_limits.so
99
session required pam_env.so
1010
session required pam_unix.so

0 commit comments

Comments
 (0)