Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
users-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
users-formula
Commits
db302890
Commit
db302890
authored
4 years ago
by
jason shaw
Browse files
Options
Downloads
Patches
Plain Diff
style: quote numbers and file modes
salt linters complain about these.
parent
b5aac779
No related branches found
No related tags found
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
users/bashrc.sls
+1
-1
1 addition, 1 deletion
users/bashrc.sls
users/googleauth.sls
+1
-1
1 addition, 1 deletion
users/googleauth.sls
users/init.sls
+9
-9
9 additions, 9 deletions
users/init.sls
users/profile.sls
+1
-1
1 addition, 1 deletion
users/profile.sls
users/vimrc.sls
+1
-1
1 addition, 1 deletion
users/vimrc.sls
with
13 additions
and
13 deletions
users/bashrc.sls
+
1
−
1
View file @
db302890
...
@@ -20,7 +20,7 @@ users_{{ name }}_user_bashrc:
...
@@ -20,7 +20,7 @@ users_{{ name }}_user_bashrc:
- name: {{ home }}/.bashrc
- name: {{ home }}/.bashrc
- user: {{ name }}
- user: {{ name }}
- group: {{ user_group }}
- group: {{ user_group }}
- mode: 644
- mode:
'0
644
'
- template: jinja
- template: jinja
- source:
- source:
- salt://users/files/bashrc/{{ name }}/bashrc
- salt://users/files/bashrc/{{ name }}/bashrc
...
...
This diff is collapsed.
Click to expand it.
users/googleauth.sls
+
1
−
1
View file @
db302890
...
@@ -13,7 +13,7 @@ users_{{ users.googleauth_dir }}:
...
@@ -13,7 +13,7 @@ users_{{ users.googleauth_dir }}:
- name: {{ users.googleauth_dir }}
- name: {{ users.googleauth_dir }}
- user: root
- user: root
- group: {{ users.root_group }}
- group: {{ users.root_group }}
- mode: 600
- mode:
'0
600
'
{%- for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %}
{%- for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %}
{%- if 'google_auth' in user %}
{%- if 'google_auth' in user %}
...
...
This diff is collapsed.
Click to expand it.
users/init.sls
+
9
−
9
View file @
db302890
...
@@ -221,8 +221,8 @@ user_keydir_{{ name }}:
...
@@ -221,8 +221,8 @@ user_keydir_{{ name }}:
- user: {{ name }}
- user: {{ name }}
- group: {{ user_group }}
- group: {{ user_group }}
- makedirs: True
- makedirs: True
- mode: 700
- mode:
'0
700
'
- dir_mode: 700
- dir_mode:
'0
700
'
- require:
- require:
- user: {{ name }}
- user: {{ name }}
- group: {{ user_group }}
- group: {{ user_group }}
...
@@ -246,9 +246,9 @@ users_{{ name }}_{{ key_name }}_key:
...
@@ -246,9 +246,9 @@ users_{{ name }}_{{ key_name }}_key:
- user: {{ name }}
- user: {{ name }}
- group: {{ user_group }}
- group: {{ user_group }}
{% if key_name.endswith(".pub") %}
{% if key_name.endswith(".pub") %}
- mode: 644
- mode:
'0
644
'
{% else %}
{% else %}
- mode: 600
- mode:
'0
600
'
{% endif %}
{% endif %}
- show_diff: False
- show_diff: False
{%- set key_value = salt['pillar.get']('users:'+name+':ssh_keys:'+_key) %}
{%- set key_value = salt['pillar.get']('users:'+name+':ssh_keys:'+_key) %}
...
@@ -272,7 +272,7 @@ users_authorized_keys_{{ name }}:
...
@@ -272,7 +272,7 @@ users_authorized_keys_{{ name }}:
- name: {{ home }}/.ssh/authorized_keys
- name: {{ home }}/.ssh/authorized_keys
- user: {{ name }}
- user: {{ name }}
- group: {{ user_group }}
- group: {{ user_group }}
- mode: 600
- mode:
'0
600
'
{% if 'ssh_auth_file' in user %}
{% if 'ssh_auth_file' in user %}
- contents: |
- contents: |
{% for auth in user.ssh_auth_file -%}
{% for auth in user.ssh_auth_file -%}
...
@@ -305,7 +305,7 @@ user_ssh_keys_files_{{ name }}_{{ key_name }}_private_key:
...
@@ -305,7 +305,7 @@ user_ssh_keys_files_{{ name }}_{{ key_name }}_private_key:
- name: {{ home }}/.ssh/{{ key_name }}
- name: {{ home }}/.ssh/{{ key_name }}
- user: {{ name }}
- user: {{ name }}
- group: {{ user_group }}
- group: {{ user_group }}
- mode: 600
- mode:
'0
600
'
- show_diff: False
- show_diff: False
- contents_pillar: {{ pillar_name }}:{{ key_name }}:privkey
- contents_pillar: {{ pillar_name }}:{{ key_name }}:privkey
- require:
- require:
...
@@ -318,7 +318,7 @@ user_ssh_keys_files_{{ name }}_{{ key_name }}_public_key:
...
@@ -318,7 +318,7 @@ user_ssh_keys_files_{{ name }}_{{ key_name }}_public_key:
- name: {{ home }}/.ssh/{{ key_name }}.pub
- name: {{ home }}/.ssh/{{ key_name }}.pub
- user: {{ name }}
- user: {{ name }}
- group: {{ user_group }}
- group: {{ user_group }}
- mode: 644
- mode:
'0
644
'
- show_diff: False
- show_diff: False
- contents_pillar: {{ pillar_name }}:{{ key_name }}:pubkey
- contents_pillar: {{ pillar_name }}:{{ key_name }}:pubkey
- require:
- require:
...
@@ -377,7 +377,7 @@ users_ssh_config_{{ name }}:
...
@@ -377,7 +377,7 @@ users_ssh_config_{{ name }}:
- name: {{ home }}/.ssh/config
- name: {{ home }}/.ssh/config
- user: {{ name }}
- user: {{ name }}
- group: {{ user_group }}
- group: {{ user_group }}
- mode: 640
- mode:
'0
640
'
- contents: |
- contents: |
# Managed by Saltstack
# Managed by Saltstack
# Do Not Edit
# Do Not Edit
...
@@ -516,7 +516,7 @@ users_googleauth-{{ svc }}-{{ name }}:
...
@@ -516,7 +516,7 @@ users_googleauth-{{ svc }}-{{ name }}:
- contents_pillar: 'users:{{ name }}:google_auth:{{ svc }}'
- contents_pillar: 'users:{{ name }}:google_auth:{{ svc }}'
- user: root
- user: root
- group: {{ users.root_group }}
- group: {{ users.root_group }}
- mode: 400
- mode:
'0
400
'
- require:
- require:
- pkg: users_googleauth-package
- pkg: users_googleauth-package
{%- endfor %}
{%- endfor %}
...
...
This diff is collapsed.
Click to expand it.
users/profile.sls
+
1
−
1
View file @
db302890
...
@@ -20,7 +20,7 @@ users_{{ name }}_user_profile:
...
@@ -20,7 +20,7 @@ users_{{ name }}_user_profile:
- name: {{ home }}/.profile
- name: {{ home }}/.profile
- user: {{ name }}
- user: {{ name }}
- group: {{ user_group }}
- group: {{ user_group }}
- mode: 644
- mode:
'0
644
'
- template: jinja
- template: jinja
- source:
- source:
- salt://users/files/profile/{{ name }}/profile
- salt://users/files/profile/{{ name }}/profile
...
...
This diff is collapsed.
Click to expand it.
users/vimrc.sls
+
1
−
1
View file @
db302890
...
@@ -24,7 +24,7 @@ users_{{ name }}_user_vimrc:
...
@@ -24,7 +24,7 @@ users_{{ name }}_user_vimrc:
- name: {{ home }}/.vimrc
- name: {{ home }}/.vimrc
- user: {{ name }}
- user: {{ name }}
- group: {{ user_group }}
- group: {{ user_group }}
- mode: 644
- mode:
'0
644
'
- template: jinja
- template: jinja
- source:
- source:
- salt://users/files/vimrc/{{ name }}/vimrc
- salt://users/files/vimrc/{{ name }}/vimrc
...
...
This diff is collapsed.
Click to expand it.
Dennis Ahrens
@ahrensde
mentioned in commit
a871df9a
·
3 years ago
mentioned in commit
a871df9a
mentioned in commit a871df9ae0c48896638a8a0d9acf86ea3fb19f56
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment