This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via fea27a56f7ef299fa2793971ef6e49f3a423fdc3 (commit) via 175f5c060ea8b967bc3020b376385d5b71116e92 (commit) from 820b2909825479b52696886d1f9054c0f709d3f0 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit fea27a56f7ef299fa2793971ef6e49f3a423fdc3 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Apr 16 13:23:17 2019 +0100

haproxy: Backup certificates, too

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 175f5c060ea8b967bc3020b376385d5b71116e92 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Apr 16 13:22:10 2019 +0100

backup: Allow passing name of tarball for creation/restore

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/backup/backup.pl | 24 +++++++++++++++++++++--- config/backup/includes/haproxy | 1 + lfs/haproxy | 2 +- 3 files changed, 23 insertions(+), 4 deletions(-)

Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 5737740e5..6ac4e4967 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -176,19 +176,34 @@ main() { local command="${1}" shift

- # Desired backup filename - local filename="/var/ipfire/backup/${NOW}.ipf" - case "${command}" in include) + local filename="${1}" + + if [ -z "${filename}" ]; then + filename="/var/ipfire/backup/${NOW}.ipf" + fi + make_backup "${filename}" $(find_logfiles) ;;

exclude) + local filename="${1}" + + if [ -z "${filename}" ]; then + filename="/var/ipfire/backup/${NOW}.ipf" + fi + make_backup "${filename}" ;;

restore) + local filename="${1}" + + if [ -z "${filename}" ]; then + filename="/tmp/restore.ipf" + fi + restore_backup "/tmp/restore.ipf" ;;

@@ -201,6 +216,9 @@ main() { ;;

iso) + # Desired backup filename + local filename="/var/ipfire/backup/${NOW}.ipf" + if make_backup "${filename}"; then /usr/local/bin/backupiso "${NOW}" & fi diff --git a/config/backup/includes/haproxy b/config/backup/includes/haproxy index 4516e18ac..483746808 100644 --- a/config/backup/includes/haproxy +++ b/config/backup/includes/haproxy @@ -1 +1,2 @@ +/etc/haproxy/certs /etc/haproxy/haproxy.cfg diff --git a/lfs/haproxy b/lfs/haproxy index ac531bede..3bdbd28fa 100644 --- a/lfs/haproxy +++ b/lfs/haproxy @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = haproxy -PAK_VER = 9 +PAK_VER = 10

DEPS = ""

hooks/post-receive -- IPFire 2.x development tree