diff --git a/.circleci/config.yml b/.circleci/config.yml index 1483974..5f3355f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: command: | mkdir -p ./bin curl -fsSL https://goss.rocks/install | GOSS_DST=./bin sh - GOSS_PATH=./bin/goss GOSS_SLEEP=2 GOSS_FILES_PATH=./tests ./bin/dgoss run -e LETSENCRYPT_STAGING=true adferrand/backuppc + GOSS_PATH=./bin/goss GOSS_SLEEP=2 GOSS_FILES_PATH=./tests ./bin/dgoss run adferrand/backuppc - run: name: Test container (integration tests) command: | diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c5e82d7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +bin \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index cffe2a9..639763a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## Unreleased +## [4.3.2-3 - 01/03/2020] +### Added +* Store mails generated by backuppc in /var/log/msmtp.log, and to supervisor stdout + +### Modify +* Do not override `EMailFromUserName` parameter in BackupPC when `SMTP_MAIL_DOMAIN` is not set + ## [4.3.2-3 - 01/03/2020] ### Added * Provide GNU tar diff --git a/README.md b/README.md index 7265b1c..1fb54d5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ #  ![](https://raw.githubusercontent.com/adferrand/docker-backuppc/master/images/logo_200px.png) adferrand/backuppc -![](https://img.shields.io/badge/tags-4%20latest-lightgrey.svg) [![](https://images.microbadger.com/badges/version/adferrand/backuppc:4.3.2-3.svg) ![](https://images.microbadger.com/badges/image/adferrand/backuppc:4.3.2-3.svg)](https://microbadger.com/images/adferrand/backuppc:4.3.2-3) [![CircleCI](https://circleci.com/gh/adferrand/docker-backuppc/tree/master.svg?style=shield)](https://circleci.com/gh/adferrand/docker-backuppc/tree/master) +![](https://img.shields.io/badge/tags-4%20latest-lightgrey.svg) [![](https://images.microbadger.com/badges/version/adferrand/backuppc:4.3.2-4.svg) ![](https://images.microbadger.com/badges/image/adferrand/backuppc:4.3.2-4.svg)](https://microbadger.com/images/adferrand/backuppc:4.3.2-4) [![CircleCI](https://circleci.com/gh/adferrand/docker-backuppc/tree/master.svg?style=shield)](https://circleci.com/gh/adferrand/docker-backuppc/tree/master) * [Container functionalities](#container-functionalities) * [About BackupPC](#about-backuppc) diff --git a/VERSION b/VERSION index f148ee3..c63acbe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.3.2-3 +4.3.2-4 diff --git a/tests/goss.yaml b/tests/goss.yaml index a93916a..bf96190 100644 --- a/tests/goss.yaml +++ b/tests/goss.yaml @@ -55,6 +55,20 @@ file: group: root filetype: file contains: [] + /etc/msmtprc: + exists: true + mode: "0644" + owner: root + group: root + filetype: file + contains: [] + /var/log/msmtp.log: + exists: true + mode: "0644" + owner: backupp + group: backuppc + filetype: file + contains: [] port: tcp:8080: listening: true @@ -67,3 +81,5 @@ process: running: true lighttpd: running: true + tail: + running: true