Merge pull request #36478 from rallytime/fix-36475

Add the "bash" option to the "code-block"directive.
This commit is contained in:
Mike Place 2016-09-22 13:15:14 +09:00 committed by GitHub
commit ec4f4f49ca

View file

@ -786,7 +786,8 @@ steps to this process:
#!/usr/bin/env sh
salt-call event.fire_master update salt/fileserver/gitfs/update
b. To enable other git users to run the hook after a `push`, use sudo in the hook script:
b. To enable other git users to run the hook after a `push`, use sudo in the hook script:
.. code-block:: bash
#!/usr/bin/env sh
@ -795,7 +796,7 @@ steps to this process:
4. If using sudo in the git hook (above), the policy must be changed to permit all users to fire the event.
Add the following policy to the sudoers file on the git server.
.. code-block::
.. code-block:: bash
Cmnd_Alias SALT_GIT_HOOK = /bin/salt-call event.fire_master update salt/fileserver/gitfs/update
Defaults!SALT_GIT_HOOK !requiretty