소스 검색

Dont force vim-formula on users

master
N 6 년 전
부모
커밋
f7dfd1f47b
5개의 변경된 파일25개의 추가작업 그리고 9개의 파일을 삭제
  1. +1
    -1
      README.rst
  2. +1
    -0
      pillar.example
  3. +6
    -0
      users/defaults.yaml
  4. +12
    -8
      users/map.jinja
  5. +5
    -0
      users/vimrc.sls

+ 1
- 1
README.rst 파일 보기



Ensures the vimrc file exists in the users home directory. Sets 'manage_vimrc: Ensures the vimrc file exists in the users home directory. Sets 'manage_vimrc:
True' in pillar per user. Defaults to False. True' in pillar per user. Defaults to False.
This depends on the vim-formula to be installed.
This depends on the vim-formula being available and pillar `users:use_vim_formula: True`.


``users.user_files`` ``users.user_files``
--------------- ---------------

+ 1
- 0
pillar.example 파일 보기

users-formula: users-formula:
use_vim_formula: True
lookup: # override the defauls in map.jinja lookup: # override the defauls in map.jinja
root_group: root root_group: root



+ 6
- 0
users/defaults.yaml 파일 보기

# -*- coding: utf-8 -*-
# vim: ft=yaml

users-formula:
use_vim_formula: False


+ 12
- 8
users/map.jinja 파일 보기

# vim: sts=2 ts=2 sw=2 et ai # vim: sts=2 ts=2 sw=2 et ai


{% set users = salt['grains.filter_by']({
{% set users = salt['grains.filter_by'](
defaults,
merge=salt['grains.filter_by']({
'MacOS': { 'MacOS': {
'sudoers_dir': '/etc/sudoers.d', 'sudoers_dir': '/etc/sudoers.d',
'sudoers_file': '/etc/sudoers', 'sudoers_file': '/etc/sudoers',
'bash_package': 'bash', 'bash_package': 'bash',
'sudo_package': 'sudo', 'sudo_package': 'sudo',
'googleauth_package': 'google-authenticator-libpam', 'googleauth_package': 'google-authenticator-libpam',
},
},
'Debian': { 'Debian': {
'sudoers_dir': '/etc/sudoers.d', 'sudoers_dir': '/etc/sudoers.d',
'sudoers_file': '/etc/sudoers', 'sudoers_file': '/etc/sudoers',
'bash_package': 'bash', 'bash_package': 'bash',
'sudo_package': 'sudo', 'sudo_package': 'sudo',
'googleauth_package': 'libpam-google-authenticator', 'googleauth_package': 'libpam-google-authenticator',
},
},
'Gentoo': { 'Gentoo': {
'sudoers_dir': '/etc/sudoers.d', 'sudoers_dir': '/etc/sudoers.d',
'sudoers_file': '/etc/sudoers', 'sudoers_file': '/etc/sudoers',
'bash_package': 'app-shells/bash', 'bash_package': 'app-shells/bash',
'sudo_package': 'app-admin/sudo', 'sudo_package': 'app-admin/sudo',
'googleauth_package': 'libpam-google-authenticator', 'googleauth_package': 'libpam-google-authenticator',
},
},
'FreeBSD': { 'FreeBSD': {
'sudoers_dir': '/usr/local/etc/sudoers.d', 'sudoers_dir': '/usr/local/etc/sudoers.d',
'sudoers_file': '/usr/local/etc/sudoers', 'sudoers_file': '/usr/local/etc/sudoers',
'bash_package': 'bash', 'bash_package': 'bash',
'sudo_package': 'sudo', 'sudo_package': 'sudo',
'googleauth_package': 'pam_google_authenticator', 'googleauth_package': 'pam_google_authenticator',
},
},
'Solaris': { 'Solaris': {
'sudoers_dir': '/opt/local/etc/sudoers.d', 'sudoers_dir': '/opt/local/etc/sudoers.d',
'sudoers_file': '/opt/local/etc/sudoers', 'sudoers_file': '/opt/local/etc/sudoers',
'bash_package': 'bash', 'bash_package': 'bash',
'sudo_package': 'sudo', 'sudo_package': 'sudo',
'googleauth_package': 'libpam-google-authenticator', 'googleauth_package': 'libpam-google-authenticator',
},
},
'default': { 'default': {
'sudoers_dir': '/etc/sudoers.d', 'sudoers_dir': '/etc/sudoers.d',
'sudoers_file': '/etc/sudoers', 'sudoers_file': '/etc/sudoers',
'bash_package': 'bash', 'bash_package': 'bash',
'sudo_package': 'sudo', 'sudo_package': 'sudo',
'googleauth_package': 'libpam-google-authenticator', 'googleauth_package': 'libpam-google-authenticator',
},
}, merge=salt['pillar.get']('users-formula:lookup')) %}
},
}, merge=salt['pillar.get']('users-formula:lookup')),
base='users',
) %}


{% if grains.os == 'MacOS' %} {% if grains.os == 'MacOS' %}
{% set group = salt['cmd.run']("stat -f '%Sg' /dev/console") %} {% set group = salt['cmd.run']("stat -f '%Sg' /dev/console") %}

+ 5
- 0
users/vimrc.sls 파일 보기

{% from "users/map.jinja" import users with context %} {% from "users/map.jinja" import users with context %}

{% if users.use_vim_formula %}

include: include:
- users - users
- vim - vim
- salt://users/files/vimrc/vimrc - salt://users/files/vimrc/vimrc
{% endif %} {% endif %}
{% endfor %} {% endfor %}

{% endif %}

Loading…
취소
저장