瀏覽代碼

Merge pull request #157 from saltstack-formulas/lookup-fix-3

(Re-)enable pillar users-formula:lookup
tags/v0.45.0
Niels Abspoel 7 年之前
父節點
當前提交
b3671fcdb3
共有 3 個檔案被更改,包括 21 行新增1 行删除
  1. +16
    -0
      README.rst
  2. +4
    -0
      pillar.example
  3. +1
    -1
      users/map.jinja

+ 16
- 0
README.rst 查看文件

@@ -51,3 +51,19 @@ This depends on the vim-formula to be installed.
---------------

Permits the abitrary management of files. See pillar.example for configuration details.

Overriding default values
=========================

In order to separate actual user account definitions from configuration the pillar ``users-formula`` was introduced:

.. code-block:: yaml

users:
myuser:
# stuff

users-formula:
lookup:
root_group: toor
shell: '/bin/zsh'

+ 4
- 0
pillar.example 查看文件

@@ -1,3 +1,7 @@
users-formula:
lookup: # override the defauls in map.jinja
root_group: root

users:
## Minimal required pillar values
auser:

+ 1
- 1
users/map.jinja 查看文件

@@ -44,4 +44,4 @@
'sudo_package': 'sudo',
'googleauth_package': 'libpam-google-authenticator',
},
}, merge=salt['pillar.get']('users:lookup')) %}
}, merge=salt['pillar.get']('users-formula:lookup')) %}

Loading…
取消
儲存