aboutsummaryrefslogtreecommitdiffstats
path: root/fripost-adduser
diff options
context:
space:
mode:
authorStefan Kangas <skangas@skangas.se>2011-03-14 15:11:29 +0100
committerStefan Kangas <skangas@skangas.se>2011-03-14 15:11:29 +0100
commit65590a4ed002ebcecdec5fb5286895e9ecbc6209 (patch)
tree9e75dd2ff6d1b7c72b2d1fd96fc798f1a52184ef /fripost-adduser
parent02fd9f27bb2f580c88a28d963ce27dcff210bf73 (diff)
Simplify adduser script
Diffstat (limited to 'fripost-adduser')
-rwxr-xr-xfripost-adduser47
1 files changed, 18 insertions, 29 deletions
diff --git a/fripost-adduser b/fripost-adduser
index 0fd534c..89a4031 100755
--- a/fripost-adduser
+++ b/fripost-adduser
@@ -28,29 +28,6 @@ use MIME::Lite;
use MIME::QuotedPrint;
use YAML::Syck;
-# Prompt for user info
-sub read_user_info {
- my $username = prompt_email("New username: ", 'is_user');
- my $name = prompt "Full (real) name: ";
- my $domain = (split /\@/, $username)[1];
- my $maildir = "$domain/". (split /\@/, $username)[0] . "/Maildir/"; # trailing slash important
- my $active = 1;
- my $password = prompt_password();
-
- # Show the information that will be inserted
- my $user = {
- username => $username,
- name => $name,
- domain => $domain,
- maildir => $maildir,
- active => $active,
- password => $password,
- };
- print Dumper $user;
-
- return $user;
-}
-
## Get command line options
our $conf = LoadFile('default.yml');
@@ -67,20 +44,32 @@ my $schema = Fripost::Schema->connect(
);
say "Adding a new virtual user.";
+{
+ my $user = {
+ username => prompt_email("New username: ", 'is_user'),
+ name => prompt "Full (real) name: ",
+ domain => (split /\@/, $username)[1],
+ maildir => "$domain/". (split /\@/, $username)[0] . "/Maildir/", # trailing slash important
+ active => 1,
+ password => prompt_password(),
+ };
-my $user = read_user_info();
-
-ask_if_ok_or_abort();
+ say "Username: $user->{username}";
+ say "Name: $user->{name}";
+ say "Password: (hidden)";
-if ($conf->{pretend}) {
- say "Nothing to do since we are pretending...";
- exit 0;
+ ask_if_ok_or_abort();
}
die "User already exists"
if ($schema->resultset('Mailbox')->search({
username => $user->{username} })->count);
+if ($conf->{pretend}) {
+ say "Nothing to do since we are pretending...";
+ exit 0;
+}
+
## Insert user into database
my $db_user = $schema->resultset('Mailbox')->new($user);
$db_user->insert;