beenull/power-mailinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes from upstream

Browse source
This commit is contained in:
David Duque 2021-09-07 17:08:05 +01:00
commit 4c4cce836e
No known key found for this signature in database
GPG key ID: 2F327738A3C0AE3A
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -22,7 +22,7 @@ sudo dpkg-reconfigure locales
curl https://raw.githubusercontent.com/ddavness/power-mailinabox/master/setup/bootstrap.sh | sudo bash
```
## Current Version: v0.54.POWER.4 (Tracking v0.54)
## Current Version: v0.54.POWER.5 (Tracking v0.54)
This is a fork of MiaB (duh), hacked and tuned to my needs:

2
api/mailinabox.yml
View file

@ -15,7 +15,7 @@ info:
license:
name: CC0 1.0 Universal
url: https://creativecommons.org/publicdomain/zero/1.0/legalcode
version: 0.54.4
version: 0.54.5
x-logo:
url: https://mailinabox.email/static/logo.png
altText: Mail-in-a-Box logo

20
management/templates/smtp-relays.html
View file

@ -69,7 +69,8 @@
<div>
<input type="password" class="form-control" id="relay_auth_pass" placeholder="password">
</div>
<p class="small">If you've already set up a relay before on this box, you can leave this field blank if you don't want to change it's password.</p>
<p class="small">If you've already set up a relay before on this box, you can leave this field
blank if you don't want to change it's password.</p>
</td>
</tr>
</table>
@ -102,22 +103,27 @@
</div>
<h3>DKIM Configuration</h3>
<p>DKIM allows receivers to verify that the email was sent by the relay you configured (this is, somebody you trust). <b>Not doing so will have your email sent to spam.</b></p>
<p>DKIM allows receivers to verify that the email was sent by the relay you configured (this is, somebody you
trust). <b>Not doing so will have your email sent to spam.</b></p>
<div class="form-group">
<table style="width: 100%">
<tr>
<td style="width: 15%;"><input type="text" style="text-align: right;" class="form-control" id="relay_dkim_selector" placeholder="selector"></td>
<td style="width: 15%;"><input type="text" style="text-align: right;" class="form-control"
id="relay_dkim_selector" placeholder="selector"></td>
<td><b>._domainkey.{{hostname}}</b></td>
</tr>
</table>
<h4>Paste the DKIM key here:</h4>
<p><textarea id="relay_dkim_key" class="form-control" style="width: 100%; height: 8em" placeholder="k=algo;p=K3y/C0N7ent5/dGhpcyBpcyBub3QgYSByZWFsIGtleSwgc28gYmV3YXJlIDrigb4"></textarea></p>
<p><textarea id="relay_dkim_key" class="form-control" style="width: 100%; height: 8em"
placeholder="k=algo;p=K3y/C0N7ent5/dGhpcyBpcyBub3QgYSByZWFsIGtleSwgc28gYmV3YXJlIDrigb4"></textarea>
</p>
</div>
<h3>After configuration</h3>
<p>By that time you should be good to go. If your relay provider provides their own custom DNS verification methods, feel free to publish them on DNS.</p>
<p>By that time you should be good to go. If your relay provider provides their own custom DNS verification
methods, feel free to publish them on DNS.</p>
<div>
<button type="submit" class="btn btn-primary">Update</button>
@ -202,7 +208,7 @@
})
},
(e) => {
show_modal_error("Error!", e, () => {return false})
show_modal_error("Error!", e, () => { return false })
}
)
}
@ -332,4 +338,4 @@
})
})
}
</script>
</script>

2
setup/bootstrap.sh
View file

@ -13,7 +13,7 @@ if [ -z "$TAG" ]; then
[ "$OS" == "Debian GNU/Linux 11 (bullseye)" ] ||
[ "$(echo $OS | grep -o 'Ubuntu 20.04')" == "Ubuntu 20.04" ]
then
TAG=v0.54.POWER.4
TAG=v0.54.POWER.5
else
echo "This script must be run on a system running one of the following OS-es:"
echo "* Debian 10 (buster)"