From 823ee0d7c48109648bd0f54769bb551ed1aede29 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 29 Oct 2015 10:25:12 +0100 Subject: [PATCH] ud-useradd: try to send the proper template --- templates/{welcome-message-800 => welcome-message-Debian} | 2 +- templates/{welcome-message-60000 => welcome-message-guest} | 2 +- ud-useradd | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename templates/{welcome-message-800 => welcome-message-Debian} (99%) rename templates/{welcome-message-60000 => welcome-message-guest} (97%) diff --git a/templates/welcome-message-800 b/templates/welcome-message-Debian similarity index 99% rename from templates/welcome-message-800 rename to templates/welcome-message-Debian index db80105..1f614b6 100644 --- a/templates/welcome-message-800 +++ b/templates/welcome-message-Debian @@ -7,7 +7,7 @@ Subject: New Debian developer __ENCODED_REALNAME__ Cc: nm@debian.org, debian-admin@debian.org Reply-To: nm@debian.org Date: __DATE__ -User-Agent: nm-create script run by __WHOAMI__ +User-Agent: ud-useradd script run by __WHOAMI__ [ This is a long mail with important information, so please read it all carefully. ] diff --git a/templates/welcome-message-60000 b/templates/welcome-message-guest similarity index 97% rename from templates/welcome-message-60000 rename to templates/welcome-message-guest index 1bff99d..e161619 100644 --- a/templates/welcome-message-60000 +++ b/templates/welcome-message-guest @@ -6,7 +6,7 @@ Subject: Debian Guest Account for __ENCODED_REALNAME__ Cc: debian-admin@lists.debian.org Reply-To: debian-admin@lists.debian.org Date: __DATE__ -User-Agent: Script run by __WHOAMI__ +User-Agent: ud-useradd script run by __WHOAMI__ Dear __REALNAME__! diff --git a/ud-useradd b/ud-useradd index d14edee..d6114ba 100755 --- a/ud-useradd +++ b/ud-useradd @@ -390,7 +390,7 @@ if Update == 1 and ForceMail == 0: # Send the Welcome message print "Sending Welcome Email" -templatepath = TemplatesDir + "/welcome-message-%d" % int(gidNumber) +templatepath = TemplatesDir + "/welcome-message-%s" % supplementaryGid if not os.path.exists(templatepath): templatepath = TemplatesDir + "/welcome-message" Reply = TemplateSubst(Subst,open(templatepath, "r").read()) -- 2.20.1