Добавлены дополнительные переменные окружения
This commit is contained in:
		| @@ -2,4 +2,4 @@ | |||||||
| owner_name: '' | owner_name: '' | ||||||
| owner_group: '{{ owner_name }}' | owner_group: '{{ owner_name }}' | ||||||
| owner_ssh_keys: [] | owner_ssh_keys: [] | ||||||
| owner_envs: {} | owner_env: {} | ||||||
|   | |||||||
| @@ -15,6 +15,7 @@ | |||||||
|     group: '{{ owner_group }}' |     group: '{{ owner_group }}' | ||||||
|     groups: '{{ owner_extra_groups }}' |     groups: '{{ owner_extra_groups }}' | ||||||
|     shell: /bin/bash |     shell: /bin/bash | ||||||
|  |   register: uc_result | ||||||
|  |  | ||||||
| - name: 'Set up user ssh keys for user "{{ owner_name }}".' | - name: 'Set up user ssh keys for user "{{ owner_name }}".' | ||||||
|   authorized_key: |   authorized_key: | ||||||
| @@ -24,6 +25,15 @@ | |||||||
|   with_items: '{{ owner_ssh_keys }}' |   with_items: '{{ owner_ssh_keys }}' | ||||||
|   when: owner_ssh_keys |   when: owner_ssh_keys | ||||||
|  |  | ||||||
|  | - name: 'Prepare env variables.' | ||||||
|  |   set_fact: | ||||||
|  |     env_dict: '{{ owner_env | combine({ | ||||||
|  |       "CURRENT_UID": uc_result.uid | default(owner_name), | ||||||
|  |       "CURRENT_GID": uc_result.group | default(owner_group), | ||||||
|  |     }) }}' | ||||||
|  |   tags: | ||||||
|  |     - env | ||||||
|  |  | ||||||
| - name: 'Set up environment variables for user "{{ owner_name }}".' | - name: 'Set up environment variables for user "{{ owner_name }}".' | ||||||
|   template: |   template: | ||||||
|     src: env.j2 |     src: env.j2 | ||||||
| @@ -38,7 +48,7 @@ | |||||||
|     path: '/home/{{ owner_name }}/.bashrc' |     path: '/home/{{ owner_name }}/.bashrc' | ||||||
|     regexp: '^export {{ item.key }}=' |     regexp: '^export {{ item.key }}=' | ||||||
|     state: absent |     state: absent | ||||||
|   with_dict: '{{ owner_env }}' |   with_dict: '{{ env_dict }}' | ||||||
|   tags: |   tags: | ||||||
|     - env |     - env | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,3 +1,3 @@ | |||||||
| {% for name, value in owner_env.iteritems() %} | {% for name in env_dict.iterkeys() | sort %} | ||||||
| {{ name }}={{ value }} | {{ name }}={{ env_dict[name] }} | ||||||
| {% endfor %} | {% endfor %} | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user