added TIME options
This commit is contained in:
parent
66b4f513dc
commit
596eff218d
|
@ -233,6 +233,8 @@ sub notify {
|
||||||
my $_tmpl = $conf{'conf'}{'TEMPLATES'};
|
my $_tmpl = $conf{'conf'}{'TEMPLATES'};
|
||||||
my $_server = $conf{'conf'}{'SERVER'};
|
my $_server = $conf{'conf'}{'SERVER'};
|
||||||
my $template = "$_tmpl/email-notify.txt";
|
my $template = "$_tmpl/email-notify.txt";
|
||||||
|
my $server_number = $1 if $_server =~ /([0-9]+)/;
|
||||||
|
my $oddeven = $server_number % 2;
|
||||||
|
|
||||||
for my $vm_name (sort keys %vms) {
|
for my $vm_name (sort keys %vms) {
|
||||||
my $_date = $vms{$vm_name}{'date'};
|
my $_date = $vms{$vm_name}{'date'};
|
||||||
|
@ -257,6 +259,10 @@ sub notify {
|
||||||
$row =~ s/IP$/$ipaddress/g;
|
$row =~ s/IP$/$ipaddress/g;
|
||||||
$row =~ s/VMID/$vm_name/g;
|
$row =~ s/VMID/$vm_name/g;
|
||||||
$row =~ s/SERVER/$_server/g;
|
$row =~ s/SERVER/$_server/g;
|
||||||
|
if ($row =~ /TIME\((.*)\)/) {
|
||||||
|
my @TIMES = split(/,/, $1);
|
||||||
|
$row =~ s/TIME\(.*\)/$TIMES[$oddeven]/g;
|
||||||
|
}
|
||||||
print $fh_email "$row\n";
|
print $fh_email "$row\n";
|
||||||
}
|
}
|
||||||
close $fh_email;
|
close $fh_email;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
From: admin
|
From: admin
|
||||||
Subject: OpenBSD Amsterdam
|
Subject: OpenBSD Amsterdam
|
||||||
|
Content-Type: text/plain; charset=utf-8
|
||||||
|
|
||||||
Hi NAME,
|
Hi NAME,
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,13 @@
|
||||||
From: admin
|
From: admin
|
||||||
Subject: OpenBSD Amsterdam - maintenance
|
Subject: OpenBSD Amsterdam - maintenance
|
||||||
|
Content-Type: text/plain; charset=utf-8
|
||||||
|
|
||||||
Hi NAME,
|
Hi NAME,
|
||||||
|
|
||||||
You have a VM (VMID) running on SERVER.
|
You have a VM (VMID) running on SERVER.
|
||||||
We will sysupgrade SERVER from OpenBSD 6.6 to OpenBSD 6.7.
|
We will sysupgrade SERVER from OpenBSD 6.8 to OpenBSD 6.9.
|
||||||
|
|
||||||
|
This will happen on 2021-xx-xx @ TIME(11:30,16:00).
|
||||||
|
|
||||||
Mischa
|
Mischa
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
From: admin
|
From: admin
|
||||||
Subject: OpenBSD Amsterdam VM not running
|
Subject: OpenBSD Amsterdam VM not running
|
||||||
|
Content-Type: text/plain; charset=utf-8
|
||||||
|
|
||||||
Hi NAME,
|
Hi NAME,
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ date="2018/11/02"
|
||||||
payment="70"
|
payment="70"
|
||||||
donated=""
|
donated=""
|
||||||
name="Test1 User"
|
name="Test1 User"
|
||||||
email="mischa@high5.nl"
|
email="vm01@high5.nl"
|
||||||
sshkey="ssh-ed25519 AAAAC3NzDITE5AAAAik7Lmiq4l4gCoYCLkJ9wlqpNhR1gUnP5EnXJXzvMVl"
|
sshkey="ssh-ed25519 AAAAC3NzDITE5AAAAik7Lmiq4l4gCoYCLkJ9wlqpNhR1gUnP5EnXJXzvMVl"
|
||||||
hostname="deploytest1"
|
hostname="deploytest1"
|
||||||
username="deploytest1"
|
username="deploytest1"
|
||||||
|
|
|
@ -2,7 +2,7 @@ date="2018/07/02"
|
||||||
payment="70"
|
payment="70"
|
||||||
donated=""
|
donated=""
|
||||||
name="Test2 User"
|
name="Test2 User"
|
||||||
email="devtest19@openbsd.amsterdam"
|
email="vm02@high5.nl"
|
||||||
sshkey="ssh-ed25519 AAAAC3NzDI1NTE5AaaaIK7lMIQ4L4GcOyclKj9WLQPnHrGuP5ExjxZVmvLn"
|
sshkey="ssh-ed25519 AAAAC3NzDI1NTE5AaaaIK7lMIQ4L4GcOyclKj9WLQPnHrGuP5ExjxZVmvLn"
|
||||||
hostname="deploytest2"
|
hostname="deploytest2"
|
||||||
username="deploytest2"
|
username="deploytest2"
|
||||||
|
|
|
@ -2,7 +2,7 @@ date="2020/07/21"
|
||||||
payment="60"
|
payment="60"
|
||||||
donated=""
|
donated=""
|
||||||
name="Test3"
|
name="Test3"
|
||||||
email="devtest19@openbsd.amsterdam"
|
email="vm03@high5.nl"
|
||||||
sshkey="ssh-ed25519 AAAAC3NzDI1NTE5AaaaIK7lMIQ4L4GcOyclKj9WLQPnHrGuP5ExjxZVmvLn"
|
sshkey="ssh-ed25519 AAAAC3NzDI1NTE5AaaaIK7lMIQ4L4GcOyclKj9WLQPnHrGuP5ExjxZVmvLn"
|
||||||
hostname="deploytest3"
|
hostname="deploytest3"
|
||||||
username="deploytest3"
|
username="deploytest3"
|
||||||
|
|
Loading…
Reference in New Issue