github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-11-14 09:14:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consistency.

Browse Source
This commit is contained in:
Antoine Nguyen
2013-09-18 22:14:36 +02:00
parent c207b96a74
commit 98f3bbda0f
9 changed files with 134 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/additional/migrating.rst
+2 -2
View File
@@ -16,7 +16,7 @@ existing `PostfixAdmin (version 2.3.3+)
First, you must follow the :ref:`installation` step to create a fresh
Modoboa database.
Once done, edit the *setting.py* file. First, add a new database
Once done, edit the :file:`settings.py` file. First, add a new database
connection named ``pfxadmin`` into the ``DATABASES`` variable
corresponding to your PostfixAdmin setup::
@@ -56,7 +56,7 @@ used by PostfixAdmin, check its configuration file if you're not sure)
Click on the *Save* button.
The procedure is over, edit the *settings.py* file and:
The procedure is over, edit the :file:`settings.py` file and:
* remove the ``pfxadmin`` database connection from the ``DATABASES``
variable
doc/additional/virtualmachine.rst
+5 -6
View File
@@ -4,9 +4,9 @@ Using the virtual machine
Introduction
============
A virtual machine with a ready-to-use *Modoboa* setup is available
`here <http://modoboa.org/resources/modoboa.vmdk.bz2>`_. It is composed
of the following components:
A virtual machine with a ready-to-use Modoboa setup is available `here
<http://modoboa.org/resources/modoboa.vmdk.bz2>`_. It is composed of
the following components:
* Debian 6.0 (squeeze)
* Modoboa and its prerequisites
@@ -32,7 +32,7 @@ If you can't use the vmdk format, you can use `qemu
Then, just use your prefered virtualization software (qemu, kvm,
virtualbox, etc.) to start the machine. You'll need to configure at
least one bridged network interface if you want to be able to play
with *Modoboa*, ie. your machine must be visible from your network.
with Modoboa, ie. your machine must be visible from your network.
The default network interface of the machine (``eth0``) is configured
to use the DHCP protocol.
@@ -49,7 +49,7 @@ root demo the root user
demo demo an unpriviliged user
===== ======== ====================
To connect to *Modoboa*, first connect to the system and retrieve its
To connect to Modoboa, first connect to the system and retrieve its
current network address like this::
$ /sbin/ifconfig eth0
@@ -72,4 +72,3 @@ admin@demo.local admin Administrator of the domain *demo.local*.
user@demo.local user Simple user. Can access to applications.
================ ======== ============================================