Merge branch 'master' into fix_tls_disable

This commit is contained in:
myoung34 2017-08-08 06:54:49 -05:00 committed by GitHub
commit 849bdb5606
4 changed files with 13 additions and 1 deletions

View file

@ -14,3 +14,5 @@ vault:
dev_mode: true dev_mode: true
service: service:
type: upstart type: upstart
user: root
group: root

View file

@ -15,3 +15,5 @@ vault:
dev_mode: true dev_mode: true
service: service:
type: systemd type: systemd
user: root
group: root

View file

@ -8,3 +8,5 @@ After=network-online.target consul.service
EnvironmentFile=-/etc/sysconfig/vault EnvironmentFile=-/etc/sysconfig/vault
Restart=on-failure Restart=on-failure
ExecStart=/usr/local/bin/vault server {% if vault.dev_mode %}-dev{% else %} -config="/etc/vault/config/server.hcl"{% endif %} ExecStart=/usr/local/bin/vault server {% if vault.dev_mode %}-dev{% else %} -config="/etc/vault/config/server.hcl"{% endif %}
User={{ vault.user }}
Group={{ vault.group }}

View file

@ -18,3 +18,9 @@ install vault:
- cmd: download vault - cmd: download vault
- pkg: unzip - pkg: unzip
- unless: test -e /usr/local/bin/vault - unless: test -e /usr/local/bin/vault
vault set cap mlock:
cmd.run:
- name: "setcap cap_ipc_lock=+ep /usr/local/bin/vault"
- onchanges:
- cmd: install vault