added more IP information to the notification email
This commit is contained in:
parent
f98ed45f36
commit
01a6e79812
|
@ -5,8 +5,15 @@ Hi NAME,
|
||||||
|
|
||||||
Welcome to OpenBSD Amsterdam! Your VM has been deployed.
|
Welcome to OpenBSD Amsterdam! Your VM has been deployed.
|
||||||
|
|
||||||
Your IPv4: IP
|
You are on host: SERVER.openbsd.amsterdam
|
||||||
Your VM name: VMID
|
Your VM name: VMID
|
||||||
Your host: SERVER.openbsd.amsterdam
|
|
||||||
|
Your IPv4 address: IPV4
|
||||||
|
Your IPv4 subnet: IPV4NETMASK
|
||||||
|
Your IPv4 gateway: IPV4GW
|
||||||
|
|
||||||
|
Your IPv6 address: IPV6
|
||||||
|
Your IPv6 subnet: 64
|
||||||
|
Your IPv6 gateway: IPV6GW
|
||||||
|
|
||||||
Mischa
|
Mischa
|
||||||
|
|
18
notify.pl
18
notify.pl
|
@ -73,6 +73,8 @@ sub deployed {
|
||||||
my $_tmpl = $conf{'conf'}{'TEMPLATES'};
|
my $_tmpl = $conf{'conf'}{'TEMPLATES'};
|
||||||
my $_server = $conf{'conf'}{'SERVER'};
|
my $_server = $conf{'conf'}{'SERVER'};
|
||||||
my $template = "$_tmpl/email-deployed.txt";
|
my $template = "$_tmpl/email-deployed.txt";
|
||||||
|
my $_ip4netmask = $conf{'conf'}{'NETMASK'};
|
||||||
|
my $_ip4gw = $conf{'conf'}{'ROUTER'};
|
||||||
|
|
||||||
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'};
|
||||||
|
@ -86,7 +88,9 @@ sub deployed {
|
||||||
if ($function_variable =~ /empty/) { print "No VMID provided\n"; last; }
|
if ($function_variable =~ /empty/) { print "No VMID provided\n"; last; }
|
||||||
if ($function_variable =~ /$vm_name/) {
|
if ($function_variable =~ /$vm_name/) {
|
||||||
(my $_firstname, my $_lastname) = split(/ /, $_name, 2);
|
(my $_firstname, my $_lastname) = split(/ /, $_name, 2);
|
||||||
my $ipaddress = qx(grep -A2 $vm_name $_etc/dhcpd.conf | awk '/fixed-address/{print \$2}' | tr -d ';\n');
|
my $ip4address = qx(grep -A2 $vm_name $_etc/dhcpd.conf | awk '/fixed-address/{print \$2}' | tr -d ';\n');
|
||||||
|
my $ip6address = qx(grep -A3 $vm_name $_etc/dhcpd.conf | awk '/fixed-address-ipv6/{print \$2}' | tr -d ';\n');
|
||||||
|
(my $ip6gw = $ip6address) =~ s/::.*/::1/;
|
||||||
|
|
||||||
open(my $fh, '<', $template);
|
open(my $fh, '<', $template);
|
||||||
open my $fh_email, "|-", "/usr/sbin/sendmail -t";
|
open my $fh_email, "|-", "/usr/sbin/sendmail -t";
|
||||||
|
@ -94,13 +98,17 @@ sub deployed {
|
||||||
while (my $row = <$fh>) {
|
while (my $row = <$fh>) {
|
||||||
chomp $row;
|
chomp $row;
|
||||||
$row =~ s/NAME/$_firstname/g;
|
$row =~ s/NAME/$_firstname/g;
|
||||||
$row =~ s/IP$/$ipaddress/g;
|
$row =~ s/IPV4$/$ip4address/g;
|
||||||
|
$row =~ s/IPV4NETMASK$/$_ip4netmask/g;
|
||||||
|
$row =~ s/IPV4GW$/$_ip4gw/g;
|
||||||
|
$row =~ s/IPV6$/$ip6address/g;
|
||||||
|
$row =~ s/IPV6GW$/$ip6gw/g;
|
||||||
$row =~ s/VMID/$vm_name/g;
|
$row =~ s/VMID/$vm_name/g;
|
||||||
$row =~ s/SERVER/$_server/g;
|
$row =~ s/SERVER/$_server/g;
|
||||||
print $fh_email "$row\n";
|
print $fh_email "$row\n";
|
||||||
}
|
}
|
||||||
close $fh_email;
|
close $fh_email;
|
||||||
print "NOTIFIED: $_date, $_payment, $_name, $_email, $_hostname, $_server ($vm_name), $ipaddress\n";
|
print "NOTIFIED: $_date, $_payment, $_name, $_email, $_hostname, $_server ($vm_name), $ip4address\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -163,12 +171,12 @@ sub renewal {
|
||||||
my $year = strftime("%Y", localtime);
|
my $year = strftime("%Y", localtime);
|
||||||
my $month = strftime("%m", localtime);
|
my $month = strftime("%m", localtime);
|
||||||
|
|
||||||
#my $total_donated = qx(ftp -Vo- https://obsda.ms/index.html | grep "donated to OpenBSD" | awk -F';' '{print \$4}' | awk '{printf \$1}');
|
#my $total_donated = qx(ftp -Vo- https://obsda.ms/index.html | grep "donated to the OpenBSD" | awk -F';' '{print \$4}' | awk '{printf \$1}');
|
||||||
#my $total_vms = qx(ftp -Vo- https://obsda.ms/index.html | grep "deployed" | awk -F '>' '{print \$3}' | awk '{printf \$1}');
|
#my $total_vms = qx(ftp -Vo- https://obsda.ms/index.html | grep "deployed" | awk -F '>' '{print \$3}' | awk '{printf \$1}');
|
||||||
#my $total_hosts = qx(ftp -Vo- https://obsda.ms/servers.html | grep -c ">Server " | tr -d '\n');
|
#my $total_hosts = qx(ftp -Vo- https://obsda.ms/servers.html | grep -c ">Server " | tr -d '\n');
|
||||||
|
|
||||||
my $response = HTTP::Tiny->new->get('https://openbsd.amsterdam/index.html');
|
my $response = HTTP::Tiny->new->get('https://openbsd.amsterdam/index.html');
|
||||||
my $total_donated = $1 if $response->{'content'} =~ /([0-9,]+) donated to OpenBSD/;
|
my $total_donated = $1 if $response->{'content'} =~ /([0-9,]+) donated to the OpenBSD/;
|
||||||
my $total_vms = $1 if $response->{'content'} =~ /([0-9,]+) VMs deployed/;
|
my $total_vms = $1 if $response->{'content'} =~ /([0-9,]+) VMs deployed/;
|
||||||
$response = HTTP::Tiny->new->get('https://openbsd.amsterdam/servers.html');
|
$response = HTTP::Tiny->new->get('https://openbsd.amsterdam/servers.html');
|
||||||
my $total_hosts = () = $response->{'content'} =~ /(\>Server )/g;
|
my $total_hosts = () = $response->{'content'} =~ /(\>Server )/g;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
mac="fe:e1:ab:dd:73:a4"
|
mac="fe:e1:ab:dd:73:a4"
|
||||||
ip="192.168.1.1"
|
ip="192.168.1.1"
|
||||||
instance="superduper1"
|
|
||||||
owner="testuser1"
|
owner="testuser1"
|
||||||
date="2018/09/02"
|
date="2018/09/02"
|
||||||
payment="70"
|
payment="70"
|
||||||
|
|
Loading…
Reference in New Issue