scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-11-02 02:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update setup website

Browse Source
This commit is contained in:
parisni
2021-06-19 00:38:53 +02:00
parent 278878d48d
commit d2803f6f46
4 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
optional/postgresql/start.py
View File

@@ -37,7 +37,6 @@ if not os.listdir("/data"):
rec.write("restore_command = 'gunzip < /backup/wal_archive/%f > %p'\n") rec.write("restore_command = 'gunzip < /backup/wal_archive/%f > %p'\n")
rec.write("standby_mode = off\n") rec.write("standby_mode = off\n")
os.system("chown postgres:postgres /data/recovery.conf") os.system("chown postgres:postgres /data/recovery.conf")
#os.system("sudo -u postgres pg_ctl start -D /data -o '-h \"''\" '")
else: else:
# Bootstrap the database # Bootstrap the database
os.system("sudo -u postgres initdb -D /data") os.system("sudo -u postgres initdb -D /data")

6
setup/flavors/compose/mailu.env
View File

@@ -175,3 +175,9 @@ DB_HOST={{ db_url }}
DB_NAME={{ db_name }} DB_NAME={{ db_name }}
{% endif %} {% endif %}
{% if (postgresql == 'external' or db_flavor == 'mysql') and webmail_type == 'roundcube' %}
ROUNDCUBE_DB_USER={{ roundcube_db_user }}
ROUNDCUBE_DB_PW={{ roundcube_db_pw }}
ROUNDCUBE_DB_HOST={{ roundcube_db_url }}
ROUNDCUBE_DB_NAME={{ roundcube_db_name }}
{% endif %}

21
setup/static/render.js
View File

@@ -57,6 +57,13 @@ $(document).ready(function() {
$("#db_pw").prop('required',true); $("#db_pw").prop('required',true);
$("#db_url").prop('required',true); $("#db_url").prop('required',true);
$("#db_name").prop('required',true); $("#db_name").prop('required',true);
if ($("#webmail").val() == 'roundcube') {
$("#roundcube_external_db").show();
$("#roundcube_db_user").prop('required',true);
$("#roundcube_db_pw").prop('required',true);
$("#roundcube_db_url").prop('required',true);
$("#roundcube_db_name").prop('required',true);
}
} else if (this.value == 'mysql') { } else if (this.value == 'mysql') {
$("#postgres_db").hide(); $("#postgres_db").hide();
$("#external_db").show(); $("#external_db").show();
@@ -64,6 +71,13 @@ $(document).ready(function() {
$("#db_pw").prop('required',true); $("#db_pw").prop('required',true);
$("#db_url").prop('required',true); $("#db_url").prop('required',true);
$("#db_name").prop('required',true); $("#db_name").prop('required',true);
if ($("#webmail").val() == 'roundcube') {
$("#roundcube_external_db").show();
$("#roundcube_db_user").prop('required',true);
$("#roundcube_db_pw").prop('required',true);
$("#roundcube_db_url").prop('required',true);
$("#roundcube_db_name").prop('required',true);
}
} }
}); });
$("#external_psql").change(function() { $("#external_psql").change(function() {
@@ -73,6 +87,13 @@ $(document).ready(function() {
$("#db_pw").prop('required',true); $("#db_pw").prop('required',true);
$("#db_url").prop('required',true); $("#db_url").prop('required',true);
$("#db_name").prop('required',true); $("#db_name").prop('required',true);
if ($("#webmail").val() == 'roundcube') {
$("#roundcube_external_db").show();
$("#roundcube_db_user").prop('required',true);
$("#roundcube_db_pw").prop('required',true);
$("#roundcube_db_url").prop('required',true);
$("#roundcube_db_name").prop('required',true);
}
} else { } else {
$("#external_db").hide(); $("#external_db").hide();
} }

14
setup/templates/steps/database.html
View File

@@ -28,7 +28,7 @@
<br/> <br/>
</div> </div>
<div class="form-group" id="external_db" style="display: none"> <div class="form-group" id="external_db" style="display: none">
<p>Set external database parameters</p> <p>Set external database parameters for <b>ADMIN UI</b></p>
<label>DB User</label> <label>DB User</label>
<input class="form-control" type="text" name="db_user" placeholder="Username" id="db_user"> <input class="form-control" type="text" name="db_user" placeholder="Username" id="db_user">
<label>Db Password</label> <label>Db Password</label>
@@ -37,6 +37,18 @@
<input class="form-control" type="text" name="db_url" placeholder="URL" id="db_url"> <input class="form-control" type="text" name="db_url" placeholder="URL" id="db_url">
<label>Db Name</label> <label>Db Name</label>
<input class="form-control" type="text" name="db_name" placeholder="Database Name" id="db_name"> <input class="form-control" type="text" name="db_name" placeholder="Database Name" id="db_name">
<br/>
<div class="form-group" id="roundcube_external_db" style="display: none">
<p>Set external database parameters for <b>Roundcube</b></p>
<label>DB User</label>
<input class="form-control" type="text" name="roundcube_db_user" placeholder="Username" id="roundcube_db_user">
<label>Db Password</label>
<input class="form-control" type="password" name="roundcube_db_pw" placeholder="Password" id="roundcube_db_pw">
<label>Db URL</label>
<input class="form-control" type="text" name="roundcube_db_url" placeholder="URL" id="roundcube_db_url">
<label>Db Name</label>
<input class="form-control" type="text" name="roundcube_db_name" placeholder="Database Name" id="roundcube_db_name">
</div>
</div> </div>
</div> </div>