Auto stash before merge of "master" and "origin/master"

This commit is contained in:
Unknown 2018-05-08 19:57:20 +08:00
parent 931569b8a6
commit 41fdeac58d
3 changed files with 4 additions and 3 deletions

View file

@ -1,7 +1,7 @@
---
# send test mail to admin
- name: test mail
shell: echo "Test mail from new/updated MSTMP at" `hostname -f` | mail root -s "Test SMTP at `hostname -f`"
shell: echo -e "Test mail from new/updated mSTMP\n\n $(uname -a)" | mail -s "Test mSMTP at $(hostname -f)" root
tags: mail
when: msmtp_send_test_mail
async: 30

View file

@ -35,12 +35,12 @@
notify: test mail
when: ansible_os_family == "Debian"
- name: Install msmtp and mailx on Archlinux.
- name: Install msmtp and s-nail on Archlinux.
pacman: name={{item}} state=present
with_items:
- msmtp
- msmtp-mta
- mailutils
- s-nail
when: ansible_os_family == "Archlinux"
- name: Copy mstprc conf file.

View file

@ -4,3 +4,4 @@
roles:
- role: role_under_test
msmtp_send_test_mail: yes