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

Render the lsb_release at flask init time

Browse source 
Don't change the index.html file at setup time
This commit is contained in:
David Duque 2020-07-14 11:51:25 +01:00
parent b562e7eefa
commit 515a74ba11
No known key found for this signature in database
GPG key ID: 2F327738A3C0AE3A
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
management/daemon.py
View file

@ -101,9 +101,12 @@ def index():
utils.fix_boto() # must call prior to importing boto utils.fix_boto() # must call prior to importing boto
import boto.s3 import boto.s3
backup_s3_hosts = [(r.name, r.endpoint) for r in boto.s3.regions()] backup_s3_hosts = [(r.name, r.endpoint) for r in boto.s3.regions()]
lsb=utils.shell("check_output", ["/usr/bin/lsb_release", "-d"])
return render_template('index.html', return render_template('index.html',
hostname=env['PRIMARY_HOSTNAME'], hostname=env['PRIMARY_HOSTNAME'],
distname=lsb[lsb.find("\t")+1:-1],
storage_root=env['STORAGE_ROOT'], storage_root=env['STORAGE_ROOT'],
no_users_exist=no_users_exist, no_users_exist=no_users_exist,

2
management/templates/index.html
View file

@ -180,7 +180,7 @@
<hr> <hr>
<footer> <footer>
<p>This is a <a href="https://github.com/ddavness/power-mailinabox">Power Mail-in-a-Box</a>, using !!___DIST_TAG___!! <p>This is a <a href="https://github.com/ddavness/power-mailinabox">Power Mail-in-a-Box</a> - {{distname}}
</p> </p>
</footer> </footer>
</div> <!-- /container --> </div> <!-- /container -->

2
setup/preflight.sh
View file

@ -18,8 +18,6 @@ if [ "$OS" != "Debian GNU/Linux 10 (buster)" -a "$OS" != "Ubuntu 20.04 LTS" ]; t
exit 1 exit 1
fi fi
sed -i "s|!!___DIST_TAG___!!|${OS}|g" management/templates/index.html
# Check that we have enough memory. # Check that we have enough memory.
# #
# /proc/meminfo reports free memory in kibibytes. Our baseline will be 512 MB, # /proc/meminfo reports free memory in kibibytes. Our baseline will be 512 MB,