change addresses

templates/email-cpu.txt

@@ -1,6 +1,4 @@
-From: admin
+From: Mischa <notify2023@openbsd.amsterdam>
-Bcc: mischa@high5.nl
-Subject: OpenBSD Amsterdam - maintenance
 Subject: OpenBSD Amsterdam VM load
 Content-Type: text/plain; charset=utf-8
 

templates/email-deployed.txt

@@ -1,13 +1,13 @@
-From: Mischa <mischa@openbsd.amsterdam>
+From: Mischa <notify2023@openbsd.amsterdam>
 Subject: OpenBSD Amsterdam
-Bcc: mischa@high5.nl
+Bcc: notify2023@high5.nl
 Content-Type: text/plain; charset=utf-8
 
 Hi FIRSTNAME,
 
 Welcome to OpenBSD Amsterdam! Your VM has been deployed.
 
-You are on host: SERVER.openbsd.amsterdam
+You are on host: SERVER.DOMAIN
 Your VM name: VMID
 
 Your IPv4 address: IPV4
@@ -29,14 +29,14 @@ More information to be found at:
 https://openbsd.amsterdam/onboard.html
 https://openbsd.amsterdam/backup.html
 
-It also includes a couple of known issues and work-arounds.
+To set your PTR / reverse DNS you can follow the steps at:
-Especially have a look at the connectivity workaround with tmux.
+https://openbsd.amsterdam/ptr.html
 
 Your payment for the year is €PAYMENT.
 
 Stripe: STRIPE
-iDEAL: https://bunq.me/openbsdams/PAYMENT/VMID%20SERVER
+iDEAL: IDEAL
-Paypal: https://paypal.me/runbsd/PAYMENTeur
+Paypal: PAYPAL
 
 For all payment options, have a look at:
 https://openbsd.amsterdam/pay.html

templates/email-deprovision.txt

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

templates/email-msg.txt

@@ -1,17 +1,12 @@
-From: admin
+From: Mischa <notify2023@openbsd.amsterdam>
-Bcc: mischa@high5.nl
+Subject: OpenBSD Amsterdam VM load
-Subject: OpenBSD Amsterdam - maintenance
 Content-Type: text/plain; charset=utf-8
 
 Hi FIRSTNAME,
 
-You have a VM (VMID) running on SERVER.
+Is your VM (VMID) on SERVER doing ok?
-We will sysupgrade SERVER from OpenBSD 6.8 to OpenBSD 6.9.
+It's consuming a load of CPU resources (80%+) which usually means something is going on.
 
-This will happen on 2021-xx-xx @ TIME(11:30,16:00) UTC.
+Let me know if there is something I can do.
 
 Mischa
-
---
-OpenBSD Amsterdam
-https://obsda.ms

templates/email-notify.txt

@@ -1,17 +1,19 @@
-From: admin
+From: Mischa <notify2023@openbsd.amsterdam>
-Bcc: mischa@high5.nl
+Subject: OpenBSD Amsterdam - PTR Daemon
-Subject: OpenBSD Amsterdam - maintenance
 Content-Type: text/plain; charset=utf-8
 
 Hi FIRSTNAME,
 
-You have a VM (VMID) running on SERVER.
+We are thrilled to announce a new function at OpenBSD Amsterdam, our very own PTR Daemon!
-We will sysupgrade SERVER from OpenBSD 6.8 to OpenBSD 6.9.
 
-This will happen on 2021-xx-xx @ TIME(11:30,16:00) UTC.
+Now, you can control your PTR directly from your VM with a simple http request.
+
+All the details can be found at https://openbsd.amsterdam/ptr.html
+
+If you have any questions please don't hesitate to reach out.
 
 Mischa
 
 --
 OpenBSD Amsterdam
-https://obsda.ms
+https://openbsd.amsterdam

templates/email-redeployed.txt

@@ -1,6 +1,6 @@
-From: Mischa <mischa@openbsd.amsterdam>
+From: Mischa <notify2023@openbsd.amsterdam>
 Subject: OpenBSD Amsterdam
-Bcc: mischa@high5.nl
+Bcc: notify2023@high5.nl
 Content-Type: text/plain; charset=utf-8
 
 Hi FIRSTNAME,

templates/email-renewal.txt

@@ -1,4 +1,4 @@
-From: Mischa <mischa@openbsd.amsterdam>
+From: Mischa <notify2023@openbsd.amsterdam>
 Subject: OpenBSD Amsterdam Renewal YEAR for VMID / SERVER - Price Change
 Content-Type: text/plain; charset=utf-8
 
@@ -25,8 +25,8 @@ with €4 per year due to the current state of the energy market.
 This means that your renewal fee for VMID on SERVER this year is €PAYMENT.
 
 Stripe: STRIPE
-iDEAL: https://bunq.me/openbsdams/PAYMENT/VMID%20on%20SERVER
+iDEAL: IDEAL
-Paypal: https://paypal.me/runbsd/PAYMENTeur
+Paypal: PAYPAL
 
 For all payment options, have a look at:
 https://openbsd.amsterdam/pay.html

templates/email-stopped.txt

@@ -1,10 +1,12 @@
-From: admin
+From: Mischa <notify2023@openbsd.amsterdam>
-Subject: OpenBSD Amsterdam VM not running
+Subject: OpenBSD Amsterdam VMID on SERVER not running
 Content-Type: text/plain; charset=utf-8
 
 Hi FIRSTNAME,
 
-Your VM, VMID on SERVER, is currently not running.
+Your VM, VMID on SERVER, is currently not running, which is most
+likely due to the fact you have FDE enabled. When this is not the
+case let us know if we need to re-deploy your VM.
 
 Mischa
 

templates/email-subscription.txt

@@ -1,4 +1,4 @@
-From: Mischa <mischa@openbsd.amsterdam>
+From: Mischa <notify2023@openbsd.amsterdam>
 Subject: OpenBSD Amsterdam Renewal YEAR for VMID / SERVER - Price Change
 Content-Type: text/plain; charset=utf-8