From ca5d4ae21c1e3625ec68f5629baa9f058870c2b6 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem.moulin@fripost.org>
Date: Sun, 3 Jun 2012 22:27:29 +0200
Subject: Extended the template to use GPG.

---
 TODO.org             | 18 +++++++++---------
 fripost.yml.template |  7 ++++++-
 lib/Fripost/Email.pm |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/TODO.org b/TODO.org
index 3da47af..4f720c7 100644
--- a/TODO.org
+++ b/TODO.org
@@ -4,15 +4,15 @@
 ** DONE Send email to newly created users
 ** TODO Log changes in log table
 ** TODO Add a flag `--send=EMAIL' to `fripost-passwd' to send the new password to an email
-** TODO Add flags `--sign=KEY' and `--encrypt=KEY' (and extend the configuration file) to respectively sign and encrypt outgoing emails.
+** DONE Add flags `--sign=KEY' and `--encrypt=KEY' (and extend the configuration file) to respectively sign and encrypt outgoing emails.
 ** TODO Detect cycles when creating aliases. (E.g., a->b, b->a should not be allowed.)
 ** TODO Add a subroutine is_email_valid with options (e.g., `allow_empty_login'), and add options to prompt_email (e.g., `allow_list', `allow_empty_login', `ensure_domain_known', `ensure_user_known', `allow_empty_user').
-** TODO Merge the tools into a single executable?
-*** fripost-adduser -> fripost user add
+** DONE Merge the tools into a single executable.
+*** fripost-adduser -> fripost user-add
 *** fripost-mkpass  -> fripost mkpass
-*** fripost-newalias -> fripost alias add
-*** fripost-newdomain -> fripost domain add
-*** fripost-passwd -> fripost user passwd
-*** fripost-searchalias -> fripost alias search
-*** fripost-searchdomain -> fripost domain search
-*** fripost-searchuser -> fripost user search
+*** fripost-newalias -> fripost alias-add
+*** fripost-newdomain -> fripost domain-add
+*** fripost-passwd -> fripost user-passwd
+*** fripost-searchalias -> fripost alias-search
+*** fripost-searchdomain -> fripost domain-search
+*** fripost-searchuser -> fripost user-search
diff --git a/fripost.yml.template b/fripost.yml.template
index 0422665..1f3045d 100644
--- a/fripost.yml.template
+++ b/fripost.yml.template
@@ -2,8 +2,13 @@
 # To be moved to ~/.fripost.yml and chmod'ed to 600.
 ---
 server_host: ldap://127.0.0.1:389
-admin_email: admin@fripost.org
 base_dn: ou=virtual,o=mailHosting,dc=fripost,dc=org
 # Replace `bind_dn' and `bind_pw' by your owner manager DN and password.
 bind_dn: cn=admin,ou=managers,o=mailHosting,dc=fripost,dc=org
 bind_pw: xxxxxx
+
+admin_email: admin@fripost.org
+# Check out the manual to GPG-sign and/or -encrypt (opportunistically)
+# the outgoing e-mails.
+#sign: ""
+#encrypt: may
diff --git a/lib/Fripost/Email.pm b/lib/Fripost/Email.pm
index 31d0efe..77db104 100755
--- a/lib/Fripost/Email.pm
+++ b/lib/Fripost/Email.pm
@@ -196,7 +196,7 @@ sub security_status {
     }
     else {
         if ($gpg->is_signed ( $msg )) {
-            return 'Signed, Plain'
+            return 'Signed'
         }
         else {
             return 'Plain'
-- 
cgit v1.2.3