change NAME to FIRSTNAME, proper matching on USERNAME

This commit is contained in:
mischa 2022-08-27 10:51:48 +02:00
parent 03a28f543b
commit 8765243a3b
11 changed files with 13 additions and 11 deletions

View File

@ -63,5 +63,5 @@ if [ $? ]; then
echo
echo "SUCCES! - deployed ${1}"
notify.pl deployed ${1}
pushover.pl -m "$(hostname -s) ${1} deployed"
pushover.pl -m "$(hostname -s) ${1} deployed" -t "OpenBSD Amsterdam"
fi

View File

@ -109,7 +109,7 @@ sub mailout {
printf $fh_email "To: %s\n", $_email;
while (my $row = <$fh>) {
chomp $row;
$row =~ s/NAME/$_firstname/g;
$row =~ s/FIRSTNAME/$_firstname/g;
$row =~ s/IPV4$/$ip4address/g;
$row =~ s/IPV4NETMASK$/$_ip4netmask/g;
$row =~ s/IPV4GW$/$_ip4gw/g;

View File

@ -4,7 +4,7 @@ Subject: OpenBSD Amsterdam - maintenance
Subject: OpenBSD Amsterdam VM load
Content-Type: text/plain; charset=utf-8
Hi NAME,
Hi FIRSTNAME,
Is your VM (VMID) on SERVER doing ok?
It's consuming a load of CPU resources (80%+) which usually means something is going on.

View File

@ -2,7 +2,7 @@ From: admin
Subject: OpenBSD Amsterdam
Content-Type: text/plain; charset=utf-8
Hi NAME,
Hi FIRSTNAME,
Welcome to OpenBSD Amsterdam! Your VM has been deployed.
@ -17,4 +17,6 @@ Your IPv6 address: IPV6
Your IPv6 subnet: 64
Your IPv6 gateway: IPV6GW
The username you provided was: USERNAME
Mischa

View File

@ -2,7 +2,7 @@ From: Mischa <mischa@openbsd.amsterdam>
Subject: OpenBSD Amsterdam VM will be deprovisioned
Content-Type: text/plain; charset=utf-8
Hi NAME,
Hi FIRSTNAME,
Your VM, VMID on SERVER, will be deprovisioned today.

View File

@ -3,7 +3,7 @@ Bcc: mischa@high5.nl
Subject: OpenBSD Amsterdam - maintenance
Content-Type: text/plain; charset=utf-8
Hi NAME,
Hi FIRSTNAME,
You have a VM (VMID) running on SERVER.
We will sysupgrade SERVER from OpenBSD 6.8 to OpenBSD 6.9.

View File

@ -3,7 +3,7 @@ Bcc: mischa@high5.nl
Subject: OpenBSD Amsterdam - maintenance
Content-Type: text/plain; charset=utf-8
Hi NAME,
Hi FIRSTNAME,
You have a VM (VMID) running on SERVER.
We will sysupgrade SERVER from OpenBSD 6.8 to OpenBSD 6.9.

View File

@ -2,7 +2,7 @@ From: admin
Subject: OpenBSD Amsterdam
Content-Type: text/plain; charset=utf-8
Hi NAME,
Hi FIRSTNAME,
Your VM has been re-deployed.

View File

@ -2,7 +2,7 @@ From: admin
Subject: OpenBSD Amsterdam Renewal YEAR for VMID / SERVER
Content-Type: text/plain; charset=utf-8
Hi NAME,
Hi FIRSTNAME,
Your renewal fee for VMID on SERVER this year is €PAYMENT.

View File

@ -2,7 +2,7 @@ From: admin
Subject: OpenBSD Amsterdam VM not running
Content-Type: text/plain; charset=utf-8
Hi NAME,
Hi FIRSTNAME,
Your VM, VMID on SERVER, is currently not running.

View File

@ -2,7 +2,7 @@ From: admin
Subject: OpenBSD Amsterdam Renewal YEAR
Content-Type: text/plain; charset=utf-8
Hi NAME,
Hi FIRSTNAME,
Your renewal fee for VMID on SERVER this year is €PAYMENT.