WebSVN – ALCASAR – Path Comparison – /

Ignore whitespace Rev 1509 → Rev 1511

 /CHANGELOG
 ,11 → 6,12
         - Configuration radius with PAP module (remove a warning)
 NEWS
         - Mageia 4.1 migration
+        - Remove Squid - Add Tinyproxy
         - Add the SMS auto-registration system
         - Add whitelist filtering (domains and related IP addreses)
         - Add IP addresses of the Toulouse blacklist in the firewall targets
         - Add whitelist/blacklist filtering by users/groups
-        - add surfmap plugin (nfsen)
+        - Add surfmap plugin (nfsen)
         - Store user password in SHA256 instead of MD5 (Thanks to Olivier HOUSSENBAY) and use a random SALT (not same hash for two same passwords)
 ACC
         - simplify the user registration menu

 /alcasar.sh
 ,7 → 1375,7
         do
         [ ! -d $i ] && mkdir $i && chown -R apache:apache $i && echo "$i created" || echo "$i already exists"
         done
-        cp -f $DIR_CONF/nfsen/PortTracker.pm /tmp/nfsen-1.3.6p1/contrib/PortTracker/
+        $SED "s?^my \$PORTSDBDIR =.*?my \$PORTSDBDIR = \"/var/log/netflow/porttracker\"?g" /tmp/nfsen-1.3.6p1/contrib/PortTracker/PortTracker.pm
 # use of our conf file and init unit
         cp $DIR_CONF/nfsen/nfsen.conf /tmp/nfsen-1.3.6p1/etc/
 # Installation of nfsen