Merge branch 'master' of github.com:modoboa/modoboa-installer
This commit is contained in:
@@ -32,7 +32,7 @@ Usage::
|
|||||||
$ sudo python3 run.py <your domain>
|
$ sudo python3 run.py <your domain>
|
||||||
|
|
||||||
|
|
||||||
If ``python3`` if not installed on your system, please install it.
|
If ``python3`` is not installed on your system, please install it.
|
||||||
|
|
||||||
A configuration file will be automatically generated the first time
|
A configuration file will be automatically generated the first time
|
||||||
you run the installer, please don't copy the
|
you run the installer, please don't copy the
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ class Automx(base.Installer):
|
|||||||
"""Additional variables."""
|
"""Additional variables."""
|
||||||
context = super(Automx, self).get_template_context()
|
context = super(Automx, self).get_template_context()
|
||||||
sql_dsn = "{}://{}:{}@{}/{}".format(
|
sql_dsn = "{}://{}:{}@{}/{}".format(
|
||||||
self.dbengine,
|
"postgresql" if self.dbengine == "postgres" else self.dbengine,
|
||||||
self.config.get("modoboa", "dbuser"),
|
self.config.get("modoboa", "dbuser"),
|
||||||
self.config.get("modoboa", "dbpassword"),
|
self.config.get("modoboa", "dbpassword"),
|
||||||
self.dbhost,
|
self.dbhost,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
inet_interfaces = all
|
inet_interfaces = all
|
||||||
inet_protocols = ipv4
|
inet_protocols = all
|
||||||
myhostname = %hostname
|
myhostname = %hostname
|
||||||
myorigin = $myhostname
|
myorigin = $myhostname
|
||||||
mydestination = $myhostname
|
mydestination = $myhostname
|
||||||
|
|||||||
Reference in New Issue
Block a user