Make generic welcome-message more generic

[mirror/userdir-ldap.git] / templates / welcome-message-60000

diff --git a/templates/welcome-message-60000 b/templates/welcome-message-60000
index 43d5f43..1bff99d 100644 (file)
--- a/templates/welcome-message-60000
+++ b/templates/welcome-message-60000
@@ -1,8 +1,8 @@
-To: "__REALNAME__" <__EMAIL__>
+To: "__ENCODED_REALNAME__" <__EMAIL__>

 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit

-Subject: Debian Guest Account for __REALNAME__
+Subject: Debian Guest Account for __ENCODED_REALNAME__

 Cc: debian-admin@lists.debian.org
 Reply-To: debian-admin@lists.debian.org
 Date: __DATE__
 Cc: debian-admin@lists.debian.org
 Reply-To: debian-admin@lists.debian.org
 Date: __DATE__


@@ -11,29 +11,40 @@ User-Agent: Script run by __WHOAMI__
 Dear __REALNAME__!
 
 An account has been created for you on the Debian machine cluster. You can
 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 <URL: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 on the machines (either
-in the host system or a chroot environment) should be directed at
-debian-admin@lists.debian.org.  Please note that not all software is
-available on all architectures.  The chroot environments can be
-entered with the 'dchroot' command.
+use this account to help make software run properly on the Debian
+distribution. The username for this account is '__LOGIN__'.
+
+See <URL:https://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
+
+On porter machines, the chroot environments can be entered with the
+'schroot' command, depending on setup; take a look at the list of
+machines to know which are our porterboxes.  You can install build
+dependencies yourself once you instantiated a session.  Please
+consult <URL:https://dsa.debian.org/doc/schroot/> for more information
+and ask your mentors if you need any help.

 
 You should use ssh to log into the machines. See the host details on
 
 You should use ssh to log into the machines. See the host details on

-db.debian.org already mentioned above 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>. 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.
-
-Please note while technically there is a __LOGIN__@debian.org address
+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:https://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
 associated with this account we very much expect you to not use it.  Thanks.
 -- 
 Debian Administration