Commit 31824075 authored by Nigel Kukard's avatar Nigel Kukard

Merge branch 'report-email' into 'master'

Change report email to use variable

See merge request !18
parents 6729fbfc 7c3c0963
Pipeline #930 passed with stages
in 3 minutes and 56 seconds
...@@ -66,7 +66,7 @@ do ...@@ -66,7 +66,7 @@ do
--create-timestamp-file \ --create-timestamp-file \
--lvm-snapshot lvm-raid/$lv \ --lvm-snapshot lvm-raid/$lv \
--email-subject "${PERIOD^^} $lv" \ --email-subject "${PERIOD^^} $lv" \
--email=hostmaster@iitsp.net \ --email="$REPORT_EMAIL" \
--port "$SERVER_PORT" --pubkey "$SERVER_KEY" \ --port "$SERVER_PORT" --pubkey "$SERVER_KEY" \
$syncopts \ $syncopts \
"$SERVER_USER"@"$SERVER_HOST"::backup/"$PERIOD-$lv" "$SERVER_USER"@"$SERVER_HOST"::backup/"$PERIOD-$lv"
...@@ -81,7 +81,7 @@ backstep-traceback --backup \ ...@@ -81,7 +81,7 @@ backstep-traceback --backup \
--lvm-snapshot lvm-raid/root \ --lvm-snapshot lvm-raid/root \
--bind-mount /boot:/boot \ --bind-mount /boot:/boot \
--email-subject "${PERIOD^^} host" \ --email-subject "${PERIOD^^} host" \
--email=hostmaster@iitsp.net \ --email="$REPORT_EMAIL" \
--port "$SERVER_PORT" --pubkey "$SERVER_KEY" \ --port "$SERVER_PORT" --pubkey "$SERVER_KEY" \
$syncopts \ $syncopts \
--zabbix $PERIOD --zabbix-config /etc/zabbix/zabbix_agentd.conf.d/allworldit.conf \ --zabbix $PERIOD --zabbix-config /etc/zabbix/zabbix_agentd.conf.d/allworldit.conf \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment