[LON-CAPA-cvs] cvs: loncom /configuration Firewall.pm
raeburn
raeburn at source.lon-capa.org
Fri Feb 8 09:55:12 EST 2013
raeburn Fri Feb 8 14:55:12 2013 EDT
Modified files:
/loncom/configuration Firewall.pm
Log:
- Use LONCAPA:distro() to get Linux distro.
Index: loncom/configuration/Firewall.pm
diff -u loncom/configuration/Firewall.pm:1.11 loncom/configuration/Firewall.pm:1.12
--- loncom/configuration/Firewall.pm:1.11 Sun May 15 00:49:41 2011
+++ loncom/configuration/Firewall.pm Fri Feb 8 14:55:12 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Firewall configuration to allow internal LON-CAPA communication between servers
#
-# $Id: Firewall.pm,v 1.11 2011/05/15 00:49:41 raeburn Exp $
+# $Id: Firewall.pm,v 1.12 2013/02/08 14:55:12 raeburn Exp $
#
# The LearningOnline Network with CAPA
#
@@ -35,6 +35,7 @@
use strict;
use lib '/home/httpd/perl/lib';
use LONCAPA::Configuration;
+use LONCAPA;
sub firewall_open_port {
my ($iptables,$fw_chains,$lond_port,$iphost,$ports) = @_;
@@ -375,11 +376,7 @@
sub get_fw_chains {
my ($iptables) = @_;
- my $distro;
- if (open(PIPE,"/home/httpd/perl/distprobe|")) {
- $distro = <PIPE>;
- close(PIPE);
- }
+ my $distro = &LONCAPA::distro();
my @fw_chains;
my $suse_config = "/etc/sysconfig/SuSEfirewall2";
my $ubuntu_config = "/etc/ufw/ufw.conf";
More information about the LON-CAPA-cvs
mailing list