Add Hestia Control Panel version to server overview

Author: Kristan Kenney

bin/v-list-sys-info

@@ -15,6 +15,9 @@ format=${1-shell}
 # Includes
 source $HESTIA/func/main.sh
 
+# Retrieve Hestia Control Panel version number
+HESTIA_VERSION=$(grep VERSION $HESTIA/conf/hestia.conf | cut -d '=' -f2 | sed "s|'||g")
+
 # JSON list function
 json_list() {
     echo '{'
@@ -23,6 +26,7 @@ json_list() {
         "OS": "'$OS'",
         "VERSION": "'$VERSION'",
         "ARCH": "'$ARCH'",
+        "HESTIA": "'$HESTIA_VERSION'",
         "UPTIME": "'$UPTIME'",
         "LOADAVERAGE": "'$LOADAVERAGE'"
         }'
@@ -31,20 +35,20 @@ json_list() {
 
 # SHELL list function
 shell_list() {
-    echo "HOSTNAME   OS   VER   ARCH  UPTIME   LA"
-    echo "--------   --   ---   ----  ------   --"
-    echo "$HOSTNAME $OS $VERSION $ARCH $UPTIME $LOADAVERAGE"
+    echo "HOSTNAME   OS   VER   ARCH  HESTIA  UPTIME   LA"
+    echo "--------   --   ---   ----  ------  ------   --"
+    echo "$HOSTNAME $OS $VERSION $ARCH $HESTIA_VERSION $UPTIME $LOADAVERAGE"
 }
 
 # PLAIN list function
 plain_list() {
-    echo -e "$HOSTNAME\t$OS\t$VERSION\t$ARCH\t$UPTIME\t$LOADAVERAGE"
+    echo -e "$HOSTNAME\t$OS\t$VERSION\t$ARCH\t$HESTIA_VERSION\t$UPTIME\t$LOADAVERAGE"
 }
 
 # CSV list function
 csv_list() {
-    echo "HOSTNAME,OS,VERSION,ARCH,UPTIME,LOADAVERAGE"
-    echo "$HOSTNAME,$OS,$VERSION,$ARCH,$UPTIME,$LOADAVERAGE"
+    echo "HOSTNAME,OS,VERSION,ARCH,HESTIA,UPTIME,LOADAVERAGE"
+    echo "$HOSTNAME,$OS,$VERSION,$ARCH,$HESTIA_VERSION,$UPTIME,$LOADAVERAGE"
 }
 
 

web/templates/admin/list_services.html

@@ -50,25 +50,28 @@
           <div class="server-info-data">
             <table class="text-small">
                <tr>
+               <td>
+                  <div class="l-unit__stat-cols clearfix">
+                    <div class="l-unit__stat-col l-unit__stat-col--left wide"><b><?=__('Hestia Control Panel')?>:</b></div>
+                    <div class="l-unit__stat-col l-unit__stat-col--right">v<?=$sys['sysinfo']['HESTIA']?></div>
+                  </div>
+                </td>
                 <td>
                   <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left wide">
-                      <b><?=$sys['sysinfo']['OS']?>
-                      <?=$sys['sysinfo']['VERSION']?></b>
-                    </div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">(<?=$sys['sysinfo']['ARCH']?>)</div>
+                    <div class="l-unit__stat-col l-unit__stat-col--left wide"><?=$sys['sysinfo']['Operating System']?></div>
+                    <div class="l-unit__stat-col l-unit__stat-col--right"><?=$sys['sysinfo']['OS']?> <?=$sys['sysinfo']['VERSION']?> (<?=$sys['sysinfo']['ARCH']?>)</div>
                   </div>
                 </td>
                 <td>
                   <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left wide"><?=__('Load Average')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right"><b><?=$sys['sysinfo']['LOADAVERAGE']?></b></div>
+                    <div class="l-unit__stat-col l-unit__stat-col--left wide"><b><?=__('Load Average')?>:</b></div>
+                    <div class="l-unit__stat-col l-unit__stat-col--right"><?=$sys['sysinfo']['LOADAVERAGE']?></div>
                   </div>
                 </td>
                 <td>
                   <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left wide"><?=__('Uptime')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right"><b><?=humanize_time($sys['sysinfo']['UPTIME'])?></b></div>
+                    <div class="l-unit__stat-col l-unit__stat-col--left wide"><b><?=__('Uptime')?>:</b></div>
+                    <div class="l-unit__stat-col l-unit__stat-col--right"><?=humanize_time($sys['sysinfo']['UPTIME'])?></div>
                   </div>
                 </td>
               </tr>