Merge branch 'seventeen-geoip' into next-geoip
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 15 Mar 2015 10:38:45 +0000 (11:38 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 15 Mar 2015 10:38:45 +0000 (11:38 +0100)
1  2 
config/firewall/rules.pl
config/rootfiles/common/stage2
html/cgi-bin/firewall.cgi
html/cgi-bin/fwhosts.cgi
langs/en/cgi-bin/en.pl
make.sh

index 8abc675,a12ab56..fa7edee
mode 100755,100644..100644
@@@ -102,13 -95,11 +103,16 @@@ sub main 
        # Load P2P block rules.
        &p2pblock();
  
+       # Load GeoIP block rules.
+       &geoipblock();
        # Reload firewall policy.
        run("/usr/sbin/firewall-policy");
 +
 +      #Reload firewall.local if present
 +      if ( -f '/etc/sysconfig/firewall.local'){
 +              run("/etc/sysconfig/firewall.local reload");
 +      }
  }
  
  sub run {
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc make.sh
+++ b/make.sh
@@@ -810,8 -815,8 +816,9 @@@ buildipfire() 
    ipfiremake squid-accounting
    ipfiremake pigz
    ipfiremake tmux
+   ipfiremake perl-Text-CSV_XS
    ipfiremake swconfig
 +  ipfiremake haproxy
  }
  
  buildinstaller() {