web: Hide certain menu items when running in cloud environments

This used to be only hidden on AWS.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 376b6a09a90af21a3183cd8957c222b77384fb3b..8ee5eaa5d595e3851f6e1e0922be1fee4d09564f 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -1288,6 +1288,10 @@ sub formatBytes {
 
 # Cloud Stuff
 
+sub running_in_cloud() {
+       return &running_on_ec2() || &running_on_gcp();
+}
+
 sub running_on_ec2() {
        if (-e "/var/run/aws-instance-id") {
                return 1;

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 8b42bf02337371872dffbf93153d4cfcb630d768..1046f59921b8d5a631cb4298faf5b749a92d5d3c 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -170,8 +170,8 @@ sub genmenu {
         $menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} = 1;
     }
 
-    # Disbale unusable things on EC2
-    if (&General::running_on_ec2()) {
+    # Disbale unusable things in cloud environments
+    if (&General::running_in_cloud()) {
         $menu->{'03.network'}{'subMenu'}->{'30.dhcp'}{'enabled'} = 0;
         $menu->{'03.network'}{'subMenu'}->{'80.macadressmenu'}{'enabled'} = 0;
         $menu->{'03.network'}{'subMenu'}->{'90.wakeonlan'}{'enabled'} = 0;