X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=templates%2Fwelcome-message-60000;h=85c4e4cfe0f7bf0ce65c731b247c7eb2d5ce4db2;hb=2126687d3ee0fc56a042bfee4f0872911320722a;hp=f7e3ee44ed92e4ad03913a3acbab2a9ddc9a87df;hpb=c3cabdb89200bda743172f063b632f68940998e8;p=mirror%2Fuserdir-ldap.git

diff --git a/templates/welcome-message-60000 b/templates/welcome-message-60000
index f7e3ee4..85c4e4c 100644
--- a/templates/welcome-message-60000
+++ b/templates/welcome-message-60000
@@ -1,7 +1,10 @@
-To: "__REALNAME__" <__EMAIL__>
-Subject: Debian Guest Account for __REALNAME__
+To: "__ENCODED_REALNAME__" <__EMAIL__>
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+Subject: Debian Guest Account for __ENCODED_REALNAME__
 Cc: debian-admin@lists.debian.org
-Reply-To: debian-admin@lists.@debian.org
+Reply-To: debian-admin@lists.debian.org
 Date: __DATE__
 User-Agent: Script run by __WHOAMI__
 
@@ -9,26 +12,40 @@ Dear __REALNAME__!
 
 An account has been created for you on the Debian machine cluster. You can
 use this account to help make software run properly on the Debian GNU/Linux
-distribution. The username for this account is '__LOGIN__'. The password can
-be found encrypted with your PGP key and appended to this message.
-
-See http://db.debian.org/machines.cgi for a list of machines that are
-available. The ones marked 'public' are available to non-developers.
-
-Requests for Debian software to be installed should be directed at
-debian-admin@lists.debian.org. Please note that not all software is available
-on all architectures.
-
-You should use ssh to log into the machines instead of regular telnet
-or rlogin. Our LDAP directory is able to share ssh RSA keys among machines,
-please see <URL:http://db.debian.org/doc-mail.html> Otherwise when you
-first login a ~/.ssh directory will be created with the appropriate
-permissions. Please be aware of the security implications of using RSA
-authentication and ssh agents.
-
-After a short while of inactivity this account will be expired. This account
-is only to be used to help porting/improving free software.
-
+distribution. The username for this account is '__LOGIN__'.
+
+See <URL:http://db.debian.org/machines.cgi> for a list of machines that are
+available.  The list of which machines you can access is user-dependent.
+To find out which machines you have access to try running
+    ldapsearch -LLL -b dc=debian,dc=org -x -h db.debian.org \
+        uid=__LOGIN__ allowedHost
+
+Requests for Debian software to be installed on the machines (either
+in the host system or a chroot environment) should be directed at
+debian-admin@lists.debian.org, see the instructions at
+http://dsa.debian.org/doc/install-req/ for details.
+Please note that not all software is available on all architectures.  The
+chroot environments can be entered with the 'dchroot' command.
+
+You should use ssh to log into the machines. See the host details on
+db.debian.org for the ssh hostkey fingerprints for the servers you
+access.  Our LDAP directory is able to share ssh RSA keys among
+machines, please see <URL:http://db.debian.org/doc-mail.html> for
+general documentation and for how to add ssh keys to the LDAP. Please be
+aware of the security implications of using RSA authentication and ssh
+agents.
+
+Your password to access db.debian.org can be found encrypted with your
+PGP key and appended to this message.  It cannot be used to log into
+our machines; see the paragraph on SSH keys above.
+
+After a short while this account will be expired, please contact DSA
+if you need it for longer or wish to re-activate your account once
+expired. This account is only to be used to help porting/improving free
+software.
+
+Please note while technically there might be __LOGIN__@debian.org address
+associated with this account we very much expect you to not use it.  Thanks.
 -- 
 Debian Administration