diff --git a/app/acf-util/welcome-html.lsp b/app/acf-util/welcome-html.lsp index 965b3f12181ae4eb0e4c69db75941542221a9e5e..0310c1d221613d659c9776e30d83512b1e1b7f72 100644 --- a/app/acf-util/welcome-html.lsp +++ b/app/acf-util/welcome-html.lsp @@ -149,7 +149,12 @@ end Last Release : <%= actual_distver %> </span><!--</a>--><br> <span class="data-title">ACF Version : </span><%= sys.value.luaver.value %> - <span class="data-title"> | ACF Server : </span><%= sys.value.ACFserver.value %> + <% if sys.value.ACFlightServer.value ~= "" then %> + <span class="data-title"> | Serve by : </span><%= sys.value.ACFlightServer.value %> + <% else %> + <span class="data-title"> | Serve by : </span><%= sys.value.ACFminiServer.value %> + <% end %> + </p> <p class="dashboard-infos dash-info-user"> <span class="data-title">User | </span><%= session.userinfo.userid %> <span class="data-title">Host | </span><%= hostname or "unknown hostname" %> diff --git a/app/alpine-baselayout/health-model.lua b/app/alpine-baselayout/health-model.lua index 8a6ce3e54370ecca90955e8caacb90fad3d17e9a..722032dfb06a4e3ecd2b11613db655838c29f4bf 100644 --- a/app/alpine-baselayout/health-model.lua +++ b/app/alpine-baselayout/health-model.lua @@ -75,7 +75,8 @@ mymodule.get_system = function (self) system.version = cfe({ value=indexver or fs.read_file("/etc/alpine-release") or "Unknown", label="Version" }) system.alpineluaver = cfe({ value=string.match(querycmd("cat /usr/share/acf/www/cgi-bin/acf"), "lua%d.%d") or "Unknown", label="Alpine Lua Version" }) system.luaver = cfe({ value=string.match(querycmd((system.alpineluaver.value) .. " -v"), "Lua%s%d.%d.%d") or "Unknown", label="Lua Version" }) - system.ACFserver = cfe({ value=querycmd("lighttpd -v") or "unknow", label="ACF Server" }) + system.ACFlightServer = cfe({ value=string.match(querycmd("lighttpd -v"), ".+%d+.%d+%p%d+") or "", label="ACF Lighttpd Server" }) + system.ACFminiServer = cfe({ value=string.match(querycmd("mini_httpd -V"), ".+%d+%p%d+") or "", label="ACF Mini_Httpd Server" }) system.timezone = cfe({ value=date.what_tz(), label="Time Zone" }) system.uname = cfe({ value=querycmd("uname -a"), label="UName" }) system.memory = cfe({ value=querycmd("free"), label="Memory usage" }) diff --git a/css/dashboard-pages/welcome.css b/css/dashboard-pages/welcome.css index e376a1ef4a5d22bb04831a2b94bf45f2e3cb6d74..b43349b5a68dfe73ff31991c2cd916e8bd844d35 100644 --- a/css/dashboard-pages/welcome.css +++ b/css/dashboard-pages/welcome.css @@ -366,8 +366,8 @@ } .icon-canvas-dash { - width: 10%; - height: 2.5rem; + width: 14%; + height: 3rem; float: right; position: relative; background-repeat: no-repeat;