diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-07-25 02:06:17 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-07-25 02:06:17 -0500 |
| commit | ac87d6d36342297200896291fbf83b4ceeb75152 (patch) | |
| tree | 426ab5b3ab87b93bad732bc6bc808b75d50934c6 | |
| parent | 06a66c936672073525ea2626b85ccc42db104f16 (diff) | |
| parent | a93e6b3077fe2cf43a09efebf9e38b0b1858c12b (diff) | |
| download | pfsense-packages-ac87d6d36342297200896291fbf83b4ceeb75152.tar.gz pfsense-packages-ac87d6d36342297200896291fbf83b4ceeb75152.tar.bz2 pfsense-packages-ac87d6d36342297200896291fbf83b4ceeb75152.zip | |
Merge pull request #906 from doktornotor/patch-2
| -rw-r--r-- | config/ntopng/ntopng.xml | 25 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 |
2 files changed, 23 insertions, 4 deletions
diff --git a/config/ntopng/ntopng.xml b/config/ntopng/ntopng.xml index 778881e8..225b3941 100644 --- a/config/ntopng/ntopng.xml +++ b/config/ntopng/ntopng.xml @@ -156,7 +156,15 @@ safe_mkdir("/var/db/ntopng/rrd/graphics", 0755, true); system("/bin/chmod -R 755 /var/db/ntopng"); system("/usr/sbin/chown -R nobody:nobody /var/db/ntopng"); - system("/bin/cp -Rp /usr/local/lib/X11/fonts/webfonts/ /usr/local/lib/X11/fonts/TTF/"); + $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); + if ($pf_version == "2.2") { + $fonts_path = "/usr/pbi/ntopng-" . php_uname("m") . "/local/lib/X11/fonts"; + } else if ($pf_version == "2.1") { + $fonts_path = "/usr/pbi/ntopng-" . php_uname("m") . "/lib/X11/fonts"; + } else { + $fonts_path = "/usr/local/lib/X11/fonts"; + } + system("/bin/cp -Rp {$fonts_path}/webfonts/ {$fonts_path}/TTF/"); $first = 0; foreach($ntopng_config['interface_array'] as $iface) { $if = convert_friendly_interface_to_real_interface_name($iface); @@ -246,12 +254,23 @@ config_unlock(); } function ntopng_update_geoip() { + $fetchcmd = "/usr/bin/fetch"; + $geolite_city = "https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz"; + $geolite_city_v6 = "https://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"; + $geoip_asnum = "https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz"; + $geoip_asnum_v6 = "https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz"; $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); if ($pf_version == "2.1" || $pf_version == "2.2") { - mwexec("/usr/pbi/ntopng-" . php_uname("m") . "/bin/ntopng-geoipupdate.sh"); + $output_dir = "/usr/pbi/ntopng-" . php_uname("m") . "/share/ntopng"; } else { - mwexec("/usr/local/bin/ntopng-geoipupdate.sh"); + $output_dir = "/usr/local/share/ntopng"; } + + mwexec("{$fetchcmd} -o {$output_dir} -T 5 {$geolite_city}"); + mwexec("{$fetchcmd} -o {$output_dir} -T 5 {$geolite_city_v6}"); + mwexec("{$fetchcmd} -o {$output_dir} -T 5 {$geoip_asnum}"); + mwexec("{$fetchcmd} -o {$output_dir} -T 5 {$geoip_asnum_v6}"); + ntopng_fixup_geoip(); restart_service("ntopng"); } diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 5dbdf482..3d977045 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -300,7 +300,7 @@ <ports_before>databases/redis databases/gdbm net/GeoIP x11-fonts/font-util x11-fonts/webfonts graphics/graphviz</ports_before> <port>net/ntopng</port> </build_pbi> - <version>0.6</version> + <version>0.7</version> <status>ALPHA</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/ntopng/ntopng.xml</config_file> |