Merge branch 'master' into development

README.md

@@ -27,7 +27,7 @@ If that doesn't work:
 curl https://raw.githubusercontent.com/ddavness/power-mailinabox/master/setup/bootstrap.sh | sudo bash
 ```
 
-## Current Version: v0.51.POWER.0 (Tracking v0.51)
+## Current Version: v0.51.POWER.1 (Tracking v0.51)
 
 This is a fork of MiaB (duh), hacked and tuned to my needs:
 

management/templates/aliases.html

@@ -94,10 +94,10 @@
   <tr id="alias-template">
     <td class='actions'>
         <a href="#" onclick="aliases_edit(this); scroll_top(); return false;" class='edit' title="Edit Alias">
-          <span class="glyphicon glyphicon-pencil"></span>
+          <span class="fas fa-pen"></span>
         </a>
         <a href="#" onclick="aliases_remove(this); return false;" class='remove' title="Remove Alias">
-          <span class="glyphicon glyphicon-trash"></span>
+          <span class="fas fa-trash"></span>
         </a>
     </td>
     <td class='address'> </td>

management/templates/external-dns.html

@@ -36,7 +36,7 @@
 
 
 <p class="alert" role="alert">
-	<span class="glyphicon glyphicon-info-sign"></span>
+	<span class="fas fa-info-circle"></span>
 	You may encounter zone file errors when attempting to create a TXT record with a long string.
 	<a href="http://tools.ietf.org/html/rfc4408#section-3.1.3">RFC 4408</a> states a TXT record is allowed to contain multiple strings, and this technique can be used to construct records that would exceed the 255-byte maximum length.
 	You may need to adopt this technique when adding DomainKeys. Use a tool like <code>named-checkzone</code> to validate your zone file.

management/templates/index.html

@@ -10,6 +10,9 @@
         <meta name="robots" content="noindex, nofollow">
 
 		<link rel="stylesheet" href="/admin/assets/bootstrap/css/bootstrap.min.css">
+		<link rel="stylesheet" href="/admin/assets/fontawesome/css/fontawesome.min.css">
+		<link rel="stylesheet" href="/admin/assets/fontawesome/css/solid.min.css">
+
         <style>
 	    body {
 		overflow-y: scroll;
@@ -190,8 +193,8 @@
           <div class="modal-dialog modal-sm">
             <div class="modal-content">
               <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 				<h4 class="modal-title" id="errorModalTitle"> </h4>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
               </div>
               <div class="modal-body">
                 <p> </p>

management/templates/system-status.html

@@ -43,8 +43,8 @@
 	}
 </style>
 
-<div class="row">
-	<div class="col-md-push-9 col-md-3">
+<div>
+	<div>
 
 		<div id="system-reboot-required" style="display: none; margin-bottom: 1em;">
 			<button type="button" class="btn btn-danger" onclick="confirm_reboot(); return false;">Reboot Box</button>
@@ -59,13 +59,12 @@
 		</div>
 
 	</div> <!-- /col -->
-	<div class="col-md-pull-3 col-md-8">
+	<br>
+	<div>
 
-		<table id="system-checks" class="table" style="max-width: 60em">
-			<thead>
-			</thead>
-			<tbody>
-			</tbody>
+		<table id="system-checks" class="table">
+			<thead></thead>
+			<tbody></tbody>
 		</table>
 
 	</div> <!-- /col -->
@@ -73,7 +72,7 @@
 
 <script>
 	function show_system_status() {
-		$('#system-checks tbody').html("<tr><td colspan='2' class='text-muted'>Loading...</td></tr>")
+		$('#system-checks tbody').html("<tr><td class='text-muted'>Loading...</td></tr>")
 
 		api(
 			"/system/privacy",

setup/bootstrap.sh

@@ -10,7 +10,7 @@ if [ -z "$TAG" ]; then
 	# Make s
 	OS=`lsb_release -d | sed 's/.*:\s*//'`
 	if [ "$OS" == "Debian GNU/Linux 10 (buster)" -o "$(echo $OS | grep -o 'Ubuntu 20.04')" == "Ubuntu 20.04" ]; then
-		TAG=v0.51.POWER.0
+		TAG=v0.51.POWER.1
 	else
 		echo "This script must be run on a system running Debian 10 OR Ubuntu 20.04 LTS."
 		exit 1

setup/management.sh

@@ -91,6 +91,16 @@ unzip -q /tmp/bootstrap.zip -d $assets_dir
 mv $assets_dir/bootstrap-$bootstrap_version-dist $assets_dir/bootstrap
 rm -f /tmp/bootstrap.zip
 
+# FontAwesome CDN URL
+fontawesome_version=5.15.1
+fontawesome_url=https://github.com/FortAwesome/Font-Awesome/releases/download/$fontawesome_version/fontawesome-free-$fontawesome_version-web.zip
+
+# Get FontAwesome
+wget_verify $fontawesome_url 911a6540bc0cc00c5d78288b24ad646ec71c21c8 /tmp/fontawesome.zip
+unzip -q /tmp/fontawesome.zip -d $assets_dir
+mv $assets_dir/fontawesome-free-$fontawesome_version-web $assets_dir/fontawesome
+rm -f /tmp/fontawesome.zip
+
 # Create an init script to start the management daemon and keep it
 # running after a reboot.
 cat > $inst_dir/start <<EOF;