Changing the command names to something more intuitive (hopefully).

1 files changed, 44 insertions, 44 deletions

diff --git a/fripost b/fripost
index e9e27e7..5a80d70 100755
--- a/fripost
+++ b/fripost
@@ -13,8 +13,8 @@ fripost - Fripost.org handling utility for virtual hosting
 
 =head1 SYNOPSIS
 
-B<fripost> [I<options>] { mkpass | user-add | user-search | user-passwd
-| domain-add | domain-search | alias-add | alias-search }
+B<fripost> [I<options>] { mkpass | add-user | search-user | user-passwd
+| add-domain | search-domain | add-alias | search-alias }
 
 B<fripost> B<--man>
 
@@ -26,11 +26,11 @@ B<fripost> B<--man>
 
 Create a random new password, and returns its hash.
 
-=item B<fripost> user-add [I<username>] [B<--password=>I<password>]
+=item B<fripost> add-user [I<username>] [B<--password=>I<password>]
 
 Add a new virtual mailbox.
 
-=item B<fripost> user-search [I<username>]
+=item B<fripost> search-user [I<username>]
 
 List matching virtual users.
 
@@ -38,19 +38,19 @@ List matching virtual users.
 
 Change user password.
 
-=item B<fripost> domain-add [I<domain> [I<username>]]
+=item B<fripost> add-domain [I<domain> [I<username>]]
 
 Add a new virtual domain.
 
-=item B<fripost> domain-search [I<domain> [I<username>]]
+=item B<fripost> search-domain [I<domain> [I<username>]]
 
 List matching virtual domains.
 
-=item B<fripost> alias-add [B<--force>] [I<goto> [I<from>...]]
+=item B<fripost> add-alias [B<--force>] [I<goto> [I<from>...]]
 
 Add a new virtual alias.
 
-=item B<fripost> alias-search [B<-f>|B<--from>] [B<-g>|B<--goto>] [I<address>]
+=item B<fripost> search-alias [B<-f>|B<--from>] [B<-g>|B<--goto>] [I<address>]
 
 List matching virtual aliases.
 
@@ -69,9 +69,9 @@ C<mkpass> is used to generate a salted SHA-1 hash of the given
 I<password>. If no argument is given, the password is randomly
 generated, respecting Fripost's password policy.
 
-=item B<fripost> user-add [I<username>] [B<--password=>I<password>]
+=item B<fripost> add-user [I<username>] [B<--password=>I<password>]
 
-C<user-add> is used to add a new virtual mailbox to the system, unless
+C<add-user> is used to add a new virtual mailbox to the system, unless
 B<--pretend> is set.
 If I<username> or I<password> are not given, the user is prompted for
 their value.
@@ -84,16 +84,16 @@ This can be useful if the user does not want to give the clear copy but
 only a hash, for example.
 Using this option disables the sending of credentials.
 
-=item B<fripost> user-search [I<username>]
+=item B<fripost> search-user [I<username>]
 
-C<user-search> is used to
+C<search-user> is used to
 list virtual mailboxes whose username matches exactly I<username>.
 Wildcards I<*> can appear in I<username>, to match zero or more characters.
 If no I<username> is given, lists all existing mailboxes.
 
-If I<username> has no domain part, C<user-search> lists matching users for any
+If I<username> has no domain part, C<search-user> lists matching users for any
 domains. 
-Otherwise, C<user-search> looks up the matching user parts for each matching
+Otherwise, C<search-user> looks up the matching user parts for each matching
 domain.
 Because of these multiple searches, the use of wildcards on the domain
 part of I<username> may be inefficient.
@@ -111,31 +111,31 @@ This can be useful if the user does not want to give the clear copy but
 only a hash, for example.
 Using this option disables the sending of credentials.
 
-=item B<fripost> domain-add [I<domain> [I<username>]]
+=item B<fripost> add-domain [I<domain> [I<username>]]
 
-C<domain-add> is used add a new virtual domain to the system, unless
+C<add-domain> is used add a new virtual domain to the system, unless
 B<--pretend> is set.
 If I<domain> is not given, the user is prompted for its value.
-By default, C<domain-add> prompts for the owner(s) of the new
+By default, C<add-domain> prompts for the owner(s) of the new
 domain; Use the empty string I<''> to create a "global" domain, only
 managed by Fripost's administrators.
 If I<domain> is an existing virtual domain, the owner(s) are simply
 added to the list of managers.
 
-=item B<fripost> domain-search [I<domain> [I<username>]]
+=item B<fripost> search-domain [I<domain> [I<username>]]
 
-C<domain-search> is used to list virtual domains matching exactly I<domain>,
+C<search-domain> is used to list virtual domains matching exactly I<domain>,
 and whose owner is I<username>.
 Wildcards I<*> can appear in I<domain>, to match zero or more characters.
 If no I<username> is given, list all domains matching I<domain>, regardless
 of the owner; If I<owner> is the empty string I<''>, list only the non
 self-managed domains.
-If neither I<domain> nor I<owner> are given, C<domain-search> lists
+If neither I<domain> nor I<owner> are given, C<search-domain> lists
 all existing virtual domains.
 
-=item B<fripost> alias-add [B<--force>] [I<goto> [I<from>...]]
+=item B<fripost> add-alias [B<--force>] [I<goto> [I<from>...]]
 
-C<alias-add> is used to add a new virtual alias to the system, unless
+C<add-alias> is used to add a new virtual alias to the system, unless
 B<--pretend> is set.
 If I<goto> or I<from> are not given, the user is prompted for their
 value.
@@ -166,18 +166,18 @@ See B<virtual>(5) for details and warnings.
 If serveral entries are matching, for instance if there are an alias from
 I<user>@I<domain> to I<goto> and another for I<user>@I<domain> to
 I<goto2>, emails to I<user>@I<domain> will be redirected to BOTH I<goto>
-and I<goto2>. Note that C<alias-add> forbids the creation of such
+and I<goto2>. Note that C<add-alias> forbids the creation of such
 multi-recipient aliases, unless B<--force> is set.
 
-=item B<fripost> alias-search [B<-f>|B<--from>] [B<-g>|B<--goto>] [I<address>]
+=item B<fripost> search-alias [B<-f>|B<--from>] [B<-g>|B<--goto>] [I<address>]
 
-C<alias-search> is used to list virtual aliases whose value or target
+C<search-alias> is used to list virtual aliases whose value or target
 matches exactly I<address>.
 As of the current version, wilcards are not allowed in I<address>; This
 will be fixed soon.
 To list matching aliases (resp., targets) only, use the flag B<-f>
 (resp., B<-g>).
-If no I<address> is given, C<alias-search> lists all existing virtual
+If no I<address> is given, C<search-alias> lists all existing virtual
 aliases.
 
 =back
@@ -315,13 +315,13 @@ use YAML::Syck;
 
 use Fripost::Schema;
 use Fripost::Commands::mkpass;
-use Fripost::Commands::user_add;
-use Fripost::Commands::user_search;
+use Fripost::Commands::add_user;
+use Fripost::Commands::search_user;
 use Fripost::Commands::user_passwd;
-use Fripost::Commands::domain_add;
-use Fripost::Commands::domain_search;
-use Fripost::Commands::alias_add;
-use Fripost::Commands::alias_search;
+use Fripost::Commands::add_domain;
+use Fripost::Commands::search_domain;
+use Fripost::Commands::add_alias;
+use Fripost::Commands::search_alias;
 
 
 ## Get global command line options
@@ -372,26 +372,26 @@ if ($cmd eq 'mkpass') {
     &Fripost::Commands::mkpass::main (@ARGV);
     exit 0;
 }
-elsif ($cmd eq 'user-add') {
-    $main = "Fripost::Commands::user_add::main";
+elsif ($cmd eq 'add-user') {
+    $main = "Fripost::Commands::add_user::main";
 }
-elsif ($cmd eq 'user-search') {
-    $main = "Fripost::Commands::user_search::main";
+elsif ($cmd eq 'search-user') {
+    $main = "Fripost::Commands::search_user::main";
 }
 elsif ($cmd eq 'user-passwd') {
     $main = "Fripost::Commands::user_passwd::main";
 }
-elsif ($cmd eq 'domain-add') {
-    $main = "Fripost::Commands::domain_add::main";
+elsif ($cmd eq 'add-domain') {
+    $main = "Fripost::Commands::add_domain::main";
 }
-elsif ($cmd eq 'domain-search') {
-    $main = "Fripost::Commands::domain_search::main";
+elsif ($cmd eq 'search-domain') {
+    $main = "Fripost::Commands::search_domain::main";
 }
-elsif ($cmd eq 'alias-add') {
-    $main = "Fripost::Commands::alias_add::main";
+elsif ($cmd eq 'add-alias') {
+    $main = "Fripost::Commands::add_alias::main";
 }
-elsif ($cmd eq 'alias-search') {
-    $main = "Fripost::Commands::alias_search::main";
+elsif ($cmd eq 'search-alias') {
+    $main = "Fripost::Commands::search_alias::main";
 }
 else {
     pod2usage( -exitstatus => 1,