From 45ac1f545f858c2d538b8e9bdb6532a1a0061286 Mon Sep 17 00:00:00 2001 From: jgg <> Date: Sun, 14 May 2000 01:15:37 +0000 Subject: [PATCH] New Mail template and more fixes for james --- templates/welcome-message-800 | 20 +++++++++----------- ud-useradd | 17 +++++++++-------- web/forward.wml | 4 ++++ 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/templates/welcome-message-800 b/templates/welcome-message-800 index 827217a..5e84fdc 100644 --- a/templates/welcome-message-800 +++ b/templates/welcome-message-800 @@ -20,13 +20,11 @@ familiarize yourself with the Debian Machine Usage Policy, available at You have been subscribed to the debian-private mailing list as -<__PRIVATE__> (you should receive seperate confirmation of this from -smartlist). Please respect the privacy of that list and don't forward +<__PRIVATE__>. Please respect the privacy of that list and don't forward mail from it elsewhere. E-mail to <__LOGIN__@debian.org> will be -forwarded to <__EMAIL__>. To change this, edit the file '.qmail' in -your home directory on master to point to the new address (don't -forget the '&' character at the beginning of the line). Also, please -subscribe to debian-devel-announce, if you haven't done so already. +forwarded to <__EMAIL__>. To change this, please see +/ Also, please subscribe to +debian-devel-announce, if you haven't done so already. We strongly suggest that you use your __LOGIN__@debian.org address for the maintainer field in your packages, because that one will be valid @@ -67,11 +65,11 @@ If you plan to make a Debian package from a not yet packaged piece of software you *must* announce your intention on the debian-devel mailing list to make sure nobody else is working on them. -The machine master.debian.org is our main archive -server. Every uploaded package finds it's way there (except for Packages -covered by US crypto laws which go to non-us.debian.org) eventually. That -machine is also the home of our bug tracking system. Project web -pages and CVS archives are hosted on va.debian.org (aka cvs/www.debian.org). +The machine ftp-master.debian.org is our main archive server. Every +uploaded package finds it's way there (except for Packages covered by US +crypto laws which go to non-us.debian.org) eventually. master.debian.org is +the home of our bug tracking system. Project web pages and CVS archives are +hosted on va.debian.org (aka cvs/www.debian.org). 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, diff --git a/ud-useradd b/ud-useradd index 37ab675..cdaf3f8 100755 --- a/ud-useradd +++ b/ud-useradd @@ -27,7 +27,7 @@ AdminUser = pwd.getpwuid(os.getuid())[0]; # Process options ForceMail = 0; OldGPGKeyRings = GPGKeyRings; -GPGKeyRings = []; +userdir_gpg.GPGKeyRings = []; (options, arguments) = getopt.getopt(sys.argv[1:], "u:ma") for (switch, val) in options: if (switch == '-u'): @@ -35,7 +35,7 @@ for (switch, val) in options: elif (switch == '-m'): ForceMail = 1; elif (switch == '-a'): - GPGKeyRings = OldGPGKeyRings; + userdir_gpg.GPGKeyRings = OldGPGKeyRings; print "Accessing LDAP directory as '" + AdminUser + "'"; Password = getpass(AdminUser + "'s password: "); @@ -97,6 +97,7 @@ while 1: account = Res; Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=" + account); if len(Attrs) == 0: + privsub = "%s@debian.org"%(account); break; Res = raw_input("That account already exists, update [no]? "); if Res == "yes": @@ -239,12 +240,12 @@ if Update == 1 and ForceMail == 0: sys.exit(0); # Do the subscription/welcome message -if privsub != " ": - Sub = TemplateSubst(Subst,open(TemplatesDir+"/list-subscribe","r").read()); - Child = os.popen("/usr/sbin/sendmail -t","w"); - Child.write(Sub); - if Child.close() != None: - raise Error, "Sendmail gave a non-zero return code"; +#if privsub != " ": +# Sub = TemplateSubst(Subst,open(TemplatesDir+"/list-subscribe","r").read()); +# Child = os.popen("/usr/sbin/sendmail -t","w"); +# Child.write(Sub); +# if Child.close() != None: +# raise Error, "Sendmail gave a non-zero return code"; # Send the Welcome message print "Sending Welcome Email" diff --git a/web/forward.wml b/web/forward.wml index ec56f37..78a3507 100644 --- a/web/forward.wml +++ b/web/forward.wml @@ -27,6 +27,10 @@ echo "emailforward: foo@bar.com" | gpg --clearsign | mail change@db.debian.org or by visiting db.debian.org +

+You can test the email routing by using the command /usr/sbin/exim -bt +foo@debian.org +

procmail

If you use procmail for your main mailbox, PLEASE, erase your .forward file and put a .procmailrc in its place instead. This feature has been -- 2.20.1