webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-14 13:02:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

aws-functions.pl: Drop file and move functions to general-functions.pl

Browse Source 
There is not enough stuff that it is justified to have an own file.

This patch therefore merges everything into general-functions.pl.

There are no functional changes.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2020-06-15 15:01:42 +00:00
parent b6a5888105
commit 4e58ab4bbf
5 changed files with 11 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
config/cfgroot/aws-functions.pl
View File

@@ -1,34 +0,0 @@
#!/usr/bin/perl -w
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2018 IPFire Team <info@ipfire.org>. #
# #
############################################################################
package AWS;
sub running_on_ec2() {
if (-e "/var/run/aws-instance-id") {
return 1;
}
return 0;
}
1;

10
config/cfgroot/general-functions.pl
View File

@@ -1286,4 +1286,14 @@ sub formatBytes {
return sprintf("%.2f %s", $bytes, $unit);
}
# Cloud Stuff
sub running_on_ec2() {
if (-e "/var/run/aws-instance-id") {
return 1;
}
return 0;
}
1;

4
config/cfgroot/header.pl
View File

@@ -19,8 +19,6 @@ use Time::Local;
$|=1; # line buffering
require "/var/ipfire/aws-functions.pl";
$Header::revision = 'final';
$Header::swroot = '/var/ipfire';
$Header::graphdir='/srv/web/ipfire/html/graphs';
@@ -173,7 +171,7 @@ sub genmenu {
}
# Disbale unusable things on EC2
if (&AWS::running_on_ec2()) {
if (&General::running_on_ec2()) {
$menu->{'03.network'}{'subMenu'}->{'30.dhcp'}{'enabled'} = 0;
$menu->{'03.network'}{'subMenu'}->{'80.macadressmenu'}{'enabled'} = 0;
$menu->{'03.network'}{'subMenu'}->{'90.wakeonlan'}{'enabled'} = 0;

1
config/rootfiles/common/configroot
View File

@@ -9,7 +9,6 @@ usr/sbin/firewall-policy
var/ipfire/addon-lang
var/ipfire/auth
#var/ipfire/auth/users
var/ipfire/aws-functions.pl
#var/ipfire/backup
var/ipfire/backup/exclude.user
var/ipfire/backup/include.user

1
lfs/configroot
View File

@@ -79,7 +79,6 @@ $(TARGET) :
cp $(DIR_SRC)/config/cfgroot/general-functions.pl $(CONFIG_ROOT)/
cp $(DIR_SRC)/config/cfgroot/network-functions.pl $(CONFIG_ROOT)/
cp $(DIR_SRC)/config/cfgroot/geoip-functions.pl $(CONFIG_ROOT)/
cp $(DIR_SRC)/config/cfgroot/aws-functions.pl $(CONFIG_ROOT)/
cp $(DIR_SRC)/config/cfgroot/ids-functions.pl $(CONFIG_ROOT)/
cp $(DIR_SRC)/config/cfgroot/lang.pl $(CONFIG_ROOT)/
cp $(DIR_SRC)/config/cfgroot/countries.pl $(CONFIG_ROOT)/