diff --git a/README.md b/README.md index 3d48790..f211ab2 100644 --- a/README.md +++ b/README.md @@ -14,3 +14,12 @@ roles: - { role: etckeeper, tags: ['system', 'etckeeper'], avoid_autocommits: true } ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +To send commit emails to root: + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +roles: + - { role: etckeeper, tags: ['system', 'etckeeper'], + avoid_autocommits: true, + etckeeper_mailto: root } +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tasks/etckeeper.yml b/tasks/etckeeper.yml index 9cb96f9..48245eb 100644 --- a/tasks/etckeeper.yml +++ b/tasks/etckeeper.yml @@ -29,3 +29,9 @@ - file: path=/etc/.bzr state=absent - name: "etckeeper: Initialize" command: etckeeper init creates=/etc/.git/ + +- name: enable etckeeper commit mails + template: src=post-commit-mail.j2 + dest=/etc/.git/hooks/post-commit + mode=0755 + when: etckeeper_mailto is defined diff --git a/templates/post-commit-mail.j2 b/templates/post-commit-mail.j2 new file mode 100644 index 0000000..658cb0c --- /dev/null +++ b/templates/post-commit-mail.j2 @@ -0,0 +1,10 @@ +#!/bin/bash + +HOSTNAME=`hostname --fqdn` +MAILTO={{ etckeeper_mailto }} + +# (echo "Diffstat:" ; git show | diffstat ; echo -e "\nDiff:" ; \ +# git show | filterdiff -x '**/*shadow*' -x '**/*.key' -x '**/private/*' ) \ +# | mail -s "etckeeper $HOSTNAME" $MAILTO + +git show --stat | mail -s "etckeeper $HOSTNAME" $MAILTO