Merge branch 'master' into feat-setup

2018-10-31 20:11:52 +01:00
parent ffdef18bd6 09abaff9b6
commit ca4804653d
19 changed files with 460 additions and 9 deletions
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -25,6 +25,9 @@ SECRET_KEY={{ secret(16) }}
 # PUBLIC_IPV4= {{ bind4 }} (default: 127.0.0.1)
 # PUBLIC_IPV6= {{ bind6 }} (default: ::1)

+# Subnet
+SUBNET={{ subnet }}
+
 # Main mail domain
 DOMAIN={{ domain }}