Преглед на файлове

Merge pull request #222 from jasonious/style-fix

style: quote numbers and file modes
tags/v0.48.6
Imran Iqbal преди 4 години
родител
ревизия
21fb2bfbd7
No account linked to committer's email address
променени са 5 файла, в които са добавени 13 реда и са изтрити 13 реда
  1. +1
    -1
      users/bashrc.sls
  2. +1
    -1
      users/googleauth.sls
  3. +9
    -9
      users/init.sls
  4. +1
    -1
      users/profile.sls
  5. +1
    -1
      users/vimrc.sls

+ 1
- 1
users/bashrc.sls Целия файл

@@ -20,7 +20,7 @@ users_{{ name }}_user_bashrc:
- name: {{ home }}/.bashrc
- user: {{ name }}
- group: {{ user_group }}
- mode: 644
- mode: '0644'
- template: jinja
- source:
- salt://users/files/bashrc/{{ name }}/bashrc

+ 1
- 1
users/googleauth.sls Целия файл

@@ -13,7 +13,7 @@ users_{{ users.googleauth_dir }}:
- name: {{ users.googleauth_dir }}
- user: root
- group: {{ users.root_group }}
- mode: 600
- mode: '0600'

{%- for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %}
{%- if 'google_auth' in user %}

+ 9
- 9
users/init.sls Целия файл

@@ -221,8 +221,8 @@ user_keydir_{{ name }}:
- user: {{ name }}
- group: {{ user_group }}
- makedirs: True
- mode: 700
- dir_mode: 700
- mode: '0700'
- dir_mode: '0700'
- require:
- user: {{ name }}
- group: {{ user_group }}
@@ -246,9 +246,9 @@ users_{{ name }}_{{ key_name }}_key:
- user: {{ name }}
- group: {{ user_group }}
{% if key_name.endswith(".pub") %}
- mode: 644
- mode: '0644'
{% else %}
- mode: 600
- mode: '0600'
{% endif %}
- show_diff: False
{%- set key_value = salt['pillar.get']('users:'+name+':ssh_keys:'+_key) %}
@@ -272,7 +272,7 @@ users_authorized_keys_{{ name }}:
- name: {{ home }}/.ssh/authorized_keys
- user: {{ name }}
- group: {{ user_group }}
- mode: 600
- mode: '0600'
{% if 'ssh_auth_file' in user %}
- contents: |
{% for auth in user.ssh_auth_file -%}
@@ -305,7 +305,7 @@ user_ssh_keys_files_{{ name }}_{{ key_name }}_private_key:
- name: {{ home }}/.ssh/{{ key_name }}
- user: {{ name }}
- group: {{ user_group }}
- mode: 600
- mode: '0600'
- show_diff: False
- contents_pillar: {{ pillar_name }}:{{ key_name }}:privkey
- require:
@@ -318,7 +318,7 @@ user_ssh_keys_files_{{ name }}_{{ key_name }}_public_key:
- name: {{ home }}/.ssh/{{ key_name }}.pub
- user: {{ name }}
- group: {{ user_group }}
- mode: 644
- mode: '0644'
- show_diff: False
- contents_pillar: {{ pillar_name }}:{{ key_name }}:pubkey
- require:
@@ -377,7 +377,7 @@ users_ssh_config_{{ name }}:
- name: {{ home }}/.ssh/config
- user: {{ name }}
- group: {{ user_group }}
- mode: 640
- mode: '0640'
- contents: |
# Managed by Saltstack
# Do Not Edit
@@ -516,7 +516,7 @@ users_googleauth-{{ svc }}-{{ name }}:
- contents_pillar: 'users:{{ name }}:google_auth:{{ svc }}'
- user: root
- group: {{ users.root_group }}
- mode: 400
- mode: '0400'
- require:
- pkg: users_googleauth-package
{%- endfor %}

+ 1
- 1
users/profile.sls Целия файл

@@ -20,7 +20,7 @@ users_{{ name }}_user_profile:
- name: {{ home }}/.profile
- user: {{ name }}
- group: {{ user_group }}
- mode: 644
- mode: '0644'
- template: jinja
- source:
- salt://users/files/profile/{{ name }}/profile

+ 1
- 1
users/vimrc.sls Целия файл

@@ -24,7 +24,7 @@ users_{{ name }}_user_vimrc:
- name: {{ home }}/.vimrc
- user: {{ name }}
- group: {{ user_group }}
- mode: 644
- mode: '0644'
- template: jinja
- source:
- salt://users/files/vimrc/{{ name }}/vimrc

Loading…
Отказ
Запис