Changeset 578


Ignore:
Timestamp:
Feb 16, 2011, 12:12:38 AM (10 years ago)
Author:
zerodeux
Message:

Documentation param fixes: s/master_password/admin_password/ (since the super user login is 'admin'...), s/files/flatfiles, don't abuse CamelCaseBecauseItsPainfulToProperlyType?, see #21

Location:
bearmail
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • bearmail/conf/bearmail.conf

    r577 r578  
    66# backend - Choose where and how account configuration is stored
    77#
    8 # FlatFiles
     8# flatfiles
    99#   Store mail account credentials in a plain text file ("mailmap"),
    1010#   and various daemon configuration also as flat files (which might
     
    1717#   TODO
    1818#
    19 # The backend configuration is specified in the [backend <name>] section.
     19# The backend configuration is specified in the [<backend name>] section.
    2020#
    21 # Example:
    22 # backend = FlatFiles
    23 #
    24 backend = FlatFiles
     21backend = flatfiles
    2522
    2623
    27 # master_password - Global super-user password.
     24# admin_password - Global super-user password.
    2825#
    29 # This password can be used with any domain or administrative login
    30 # such as 'root' or 'admin' to login with the web interface and
    31 # get super-user privileges (view and manage all domains).
     26# This password is associated to the special 'admin' account and
     27# gives all priviliges. It is defined outsied of the backend
     28# scope on purpose.
    3229#
    3330# The value should be a MD5 hash (32 hexadecimal digits).
    3431#
    3532# Example:
    36 # master_password = 21232f297a57a5a743894a0e4a801fc3
     33# admin_password = 21232f297a57a5a743894a0e4a801fc3
    3734#
    38 master_password = no_hash_no_superuser
     35admin_password = no_hash_no_superuser
    3936
    4037
     
    4643# TODO: document backend-specific parameters
    4744
    48 [backend FlatFiles]
     45[flatfiles]
    4946mailmap = /etc/bearmail/mailmap
    5047postfix = /etc/postfix
    5148dovecot = /etc/dovecot
    5249
    53 [backend SQL]
     50[SQL]
    5451db_host = localhost
    5552db_name = bearmail
  • bearmail/lib/BearMail/Backend.pm

    r577 r578  
    230230
    231231    my $be_name = $cfg->{_}->{backend};
    232     if ($be_name eq 'FlatFiles') {
     232    if ($be_name eq 'flatfiles') {
    233233        require BearMail::Backend::FlatFiles;
    234         return  BearMail::Backend::FlatFiles->new($cfg->{"backend FlatFiles"});
     234        return  BearMail::Backend::FlatFiles->new($cfg->{"flatfiles"});
    235235    }
    236236    carp "Unknown backend '$be_name' (missing BearMail::Backend::$be_name module ?)";
Note: See TracChangeset for help on using the changeset viewer.