WebSVN – ALCASAR – Path Comparison – /

Ignore whitespace Rev 2775 → Rev 2774

 /alcasar.sh
 ,7 → 38,7
 #       antivirus               : HAVP + libclamav configuration
 #       tinyproxy               : little proxy for user filtered with "WL + antivirus" and "antivirus"
 #       ulogd                   : log system in userland (match NFLOG target of iptables)
-#       nfsen                   : Configuration of Netflow grapher (nfsen) & netflow collector (nfcapd)
+#       nfsen                   : Configuration of Nfsen Netflow grapher
 #       unbound                 : Name server configuration
 #       dnsmasq                 : Name server configuration (for whitelist ipset support)
 #       vnstat                  : little network stat daemon
 ,6 → 764,8
 CA()
 {
         $DIR_DEST_BIN/alcasar-CA.sh
+        chown -R root:apache /etc/pki
+        chmod -R 750 /etc/pki
 } # End of CA()
 ###################################################
 ,7 → 1083,7
 ExecStart=/usr/libexec/chilli start
 ExecStop=/usr/libexec/chilli stop
 ExecReload=/usr/libexec/chilli reload
-PIDFile=/run/chilli.pid
+PIDFile=/var/run/chilli.pid
 [Install]
 WantedBy=multi-user.target
 ,7 → 1111,7
 [ -f /usr/sbin/chilli ] || exit 0
 . /etc/init.d/functions
 CONFIG=/etc/chilli.conf
-pidfile=/run/chilli.pid
+pidfile=/var/run/chilli.pid
 [ -f \$CONFIG ] || {
         echo "\$CONFIG Not found"
         exit 0
 ,7 → 1126,7
                 else
                         gprintf "Starting \$prog: "
                         echo '' > \$current_users_file && chown apache:apache \$current_users_file
-                        rm -f /run/chilli* # cleaning
+                        rm -f /var/run/chilli* # cleaning
                         /usr/sbin/modprobe tun >/dev/null 2>&1
                         echo 1 > /proc/sys/net/ipv4/ip_forward
                         [ -e /dev/net/tun ] || {
 ,9 → 1194,9
         PRIVATE_IP_HEXA=$(printf "%02x\n" "$(echo $PRIVATE_IP | cut -d'.' -f1)")$(printf "%02x\n" "$(echo $PRIVATE_IP | cut -d'.' -f2)")$(printf "%02x\n" "$(echo $PRIVATE_IP | cut -d'.' -f3)")$(printf "%02x\n" "$(echo $PRIVATE_IP | cut -d'.' -f4)")
         cat <<EOF > /etc/chilli.conf
 # coova config for ALCASAR
-cmdsocket       /run/chilli.sock
+cmdsocket       /var/run/chilli.sock
 unixipc         chilli.$INTIF.ipc
-pidfile         /run/chilli.pid
+pidfile         /var/run/chilli.pid
 net             $PRIVATE_NETWORK_MASK
 dhcpif          $INTIF
 ethers          $DIR_DEST_ETC/alcasar-ethers
 ,38 → 1263,44
 ################################################################
 e2guardian()
 {
+        mkdir -p /var/e2guardian /var/log/e2guardian
+        chown -R e2guardian /var/e2guardian /var/log/e2guardian
 # Adapt systemd unit
 [ -e /lib/systemd/system/e2guardian.service.default ] || cp /lib/systemd/system/e2guardian.service /lib/systemd/system/e2guardian.service.default
         $SED "s?^ExecStart=.*?ExecStart=/usr/sbin/e2guardian -c /etc/e2guardian/e2guardian.conf?g" /lib/systemd/system/e2guardian.service
         $SED "s?^After=.*?After=network.target chilli.service?g" /lib/systemd/system/e2guardian.service
         [ -e $DIR_DG/e2guardian.conf.default ] || cp $DIR_DG/e2guardian.conf $DIR_DG/e2guardian.conf.default
 # Adapt the main conf file
 # French deny HTML page
         $SED "s?^language =.*?language = 'french'?g" $DIR_DG/e2guardian.conf
 # Listen only on LAN side
         $SED "s?^filterip.*?filterip = $PRIVATE_IP?g" $DIR_DG/e2guardian.conf
-# E2guardian listens on 8080 (HTTP)
-        $SED "s?^filterports =.*?filterports = 8080?g" $DIR_DG/e2guardian.conf
-# E2guardian listens transparently on 8443 (HTTPS)
-        $SED "s?^transparenthttpsport =.*?transparenthttpsport = 8443?g" $DIR_DG/e2guardian.conf
+# The port that E2guardian listens to HTTP
+        $SED "s?^filterports =*?filterports = 8080?g" $DIR_DG/e2guardian.conf
+# The port that E2guardian listens to HTTPS
+        $SED "s?^transparenthttpsport =*?transparenthttpsport = 8443?g" $DIR_DG/e2guardian.conf
 # DG send its flow to HAVP (127.0.0.1:8090)
         $SED "s?^#proxyip.*?proxyip = 127.0.0.1?g" $DIR_DG/e2guardian.conf
         $SED "s?^#proxyport.*?proxyport = 8090?g" $DIR_DG/e2guardian.conf
 # Don't log
         $SED "s?^loglevel =.*?loglevel = 0?g" $DIR_DG/e2guardian.conf
-# Disable HTML content control (weighted & banned)
+# Disable HTML content control
         $SED "s?^weightedphrasemode =.*?weightedphrasemode = 0?g" $DIR_DG/e2guardian.conf
+# ???
     cp $DIR_DG/lists/bannedphraselist $DIR_DG/lists/bannedphraselist.default
         $SED "s?^[^#]?#&?g" $DIR_DG/lists/bannedphraselist # (comment what is not)
 # Disable URL control with regex
+# do nothing
     cp $DIR_DG/lists/bannedregexpurllist $DIR_DG/lists/bannedregexpurllist.default
         $SED "s?^[^#]?#&?g" $DIR_DG/lists/bannedregexpurllist # (comment what is not)
 # Adapt the first group file (only one for instance)
         [ -e $DIR_DG/e2guardianf1.conf.default ] || cp $DIR_DG/e2guardianf1.conf $DIR_DG/e2guardianf1.conf.default
 # Reporting (deny page) in HTML
         $SED "s/^reportinglevel =.*/reportinglevel = 3/g" $DIR_DG/e2guardianf1.conf
-# Replace the default deny HTML page (only fr & uk) --> !!! search why our pages make the server crash...
+# Replace the default deny HTML page (only fr & uk) --> search why our pages make the server crash...
 #       [ -e /usr/share/e2guardian/languages/french/template.html.default ] || mv /usr/share/e2guardian/languages/french/template.html /usr/share/e2guardian/languages/french/template.html.default
 #       cp -f $DIR_CONF/template-fr.html /usr/share/e2guardian/languages/french/template.html
 #       [ -e /usr/share/e2guardian/languages/ukenglish/template.html.default ] || mv /usr/share/e2guardian/languages/ukenglish/template.html /usr/share/e2guardian/languages/ukenglish/template.html.default
 ,8 → 1316,7
 # Creation of ALCASAR banned site list
         [ -e $DIR_DG/lists/bannedsitelist.default ] || mv $DIR_DG/lists/bannedsitelist $DIR_DG/lists/bannedsitelist.default
         cat <<EOF > $DIR_DG/lists/bannedsitelist
-# E2guardian filter config for ALCASAR
-# In ALCASAR E2guardian filters only URLs (domains are filtered with unbound)
+# E2guardian domain filter config for ALCASAR
 # block all sites except those in the exceptionsitelist --> liste blanche (désactivée)
 #**
 # block all SSL and CONNECT tunnels
 ,18 → 1326,18
 # block all sites specified only by an IP
 *ip
 EOF
-# Creation of ALCASAR empty banned URLs list (filled later with Toulouse BL --> see BL function)
+# Creation of ALCASAR banned URL list (empty)
         [ -e $DIR_DG/lists/bannedurllist.default ] || mv $DIR_DG/lists/bannedurllist $DIR_DG/lists/bannedurllist.default
         cat <<EOF > $DIR_DG/lists/bannedurllist
 # E2guardian filter config for ALCASAR
 EOF
-# Creation of files for rehabilited domains and urls
+# Creation of file for the rehabilited domains and urls
         [ -e $DIR_DG/lists/exceptionsitelist.default ] || mv $DIR_DG/lists/exceptionsitelist $DIR_DG/lists/exceptionsitelist.default
         [ -e $DIR_DG/lists/exceptionurllist.default ] || mv $DIR_DG/lists/exceptionurllist $DIR_DG/lists/exceptionurllist.default
         touch $DIR_DG/lists/exceptionsitelist
         touch $DIR_DG/lists/exceptionurllist
 # Add Bing to the safesearch url regext list (parental control)
-        [ -e $DIR_DG/lists/urlregexplist.default ] || cp $DIR_DG/lists/urlregexplist $DIR_DG/lists/urlregexplist.default
+        [ -e $DIR_DG/lists/urlregexplist.default ] || mv $DIR_DG/lists/urlregexplist $DIR_DG/lists/urlregexplist.default
         cat <<EOF >> $DIR_DG/lists/urlregexplist
 # Bing - add 'adlt=strict'
 #"(^http://[0-9a-z]+\.bing\.[a-z]+[-/%.0-9a-z]*\?)(.*)"->"\1\2&adlt=strict"
 ,9 → 1346,6
         $SED "s?images?search?g" $DIR_DG/lists/urlregexplist
 # change the google safesearch ("safe=strict" instead of "safe=vss")
         $SED "s?safe=vss?safe=strict?g" $DIR_DG/lists/urlregexplist
-# create log folder
-    mkdir -p /var/log/e2guardian
-        chown -R e2guardian /etc/e2guardian /var/log/e2guardian
 } # End of e2guardian()
 ##################################################################
 ,12 → 1363,12
         fi
         groupadd -f havp
         useradd -r -g havp -s /bin/false -c "system user for havp (antivirus proxy)" havp
-        mkdir -p /var/tmp/havp /var/log/havp /run/havp /var/log/clamav /var/lib/clamav
-        chown -R havp:havp /var/tmp/havp /var/log/havp /run/havp
+        mkdir -p /var/tmp/havp /var/log/havp /var/run/havp /var/log/clamav /var/lib/clamav
+        chown -R havp:havp /var/tmp/havp /var/log/havp /var/run/havp
         chown -R clamav:clamav /var/log/clamav /var/lib/clamav
         [ -e /etc/havp/havp.config.default ] || cp /etc/havp/havp.config /etc/havp/havp.config.default
         $SED "/^REMOVETHISLINE/d" /etc/havp/havp.config
-        $SED "s?^# PIDFILE.*?PIDFILE /run/havp/havp.pid?g" /etc/havp/havp.config        # pidfile
+        $SED "s?^# PIDFILE.*?PIDFILE /var/run/havp/havp.pid?g" /etc/havp/havp.config    # pidfile
         $SED "s?^# TRANSPARENT.*?TRANSPARENT false?g" /etc/havp/havp.config             # transparent mode
         $SED "s?^# BIND_ADDRESS.*?BIND_ADDRESS 127.0.0.1?g" /etc/havp/havp.config       # we listen only on loopback
         $SED "s?^# PORT.*?PORT 8090?g" /etc/havp/havp.config                            # datas come on port 8090 (on loopback)
 ,8 → 1414,8
         fi
         groupadd -f tinyproxy
         useradd -r -g tinyproxy -s /bin/false -c "system user for tinyproxy" tinyproxy
-        mkdir -p /run/tinyproxy /var/log/tinyproxy
-        chown -R tinyproxy.tinyproxy /run/tinyproxy /var/log/tinyproxy
+        mkdir -p /var/run/tinyproxy /var/log/tinyproxy
+        chown -R tinyproxy.tinyproxy /var/run/tinyproxy /var/log/tinyproxy
         [ -e /etc/tinyproxy/tinyproxy.conf.default ] || cp /etc/tinyproxy/tinyproxy.conf /etc/tinyproxy/tinyproxy.conf.default
         $SED "s?^User.*?User tinyproxy?g" /etc/tinyproxy/tinyproxy.conf
         $SED "s?^Group.*?Group tinyproxy?g" /etc/tinyproxy/tinyproxy.conf
 ,7 → 1422,7
         $SED "s?^Port.*?Port 8090?g" /etc/tinyproxy/tinyproxy.conf                      # Listen Port
         $SED "s?^#Listen.*?Listen $PRIVATE_IP?g" /etc/tinyproxy/tinyproxy.conf          # Listen NIC (only intif)
         $SED "s?^#LogFile.*?LogFile \"/var/log/tinyproxy/tinyproxy.log\"?g" /etc/tinyproxy/tinyproxy.conf
-        $SED "s?^#PidFile.*?PidFile \"/run/tinyproxy/tinyproxy.pid\"?g" /etc/tinyproxy/tinyproxy.conf
+        $SED "s?^#PidFile.*?PidFile \"/var/run/tinyproxy/tinyproxy.pid\"?g" /etc/tinyproxy/tinyproxy.conf
         $SED "s?^LogLevel.*?LogLevel Error?g" /etc/tinyproxy/tinyproxy.conf             # Only errors are logged
         $SED "s?^#Upstream.*?Upstream http 127.0.0.1:8090?g" /etc/tinyproxy/tinyproxy.conf      # forward to HAVP
         $SED "s?^#DisableViaHeader.*?DisableViaHeader Yes?g" /etc/tinyproxy/tinyproxy.conf      # Stealth mode
 ,9 → 1444,9
 [Service]
 Type=forking
-ExecStartPre=/bin/chown -R tinyproxy.tinyproxy /run/tinyproxy /var/log/tinyproxy
+ExecStartPre=/bin/chown -R tinyproxy.tinyproxy /var/run/tinyproxy /var/log/tinyproxy
 ExecStartPre=/bin/sleep 2
-PIDFile=/run/tinyproxy/tinyproxy.pid
+PIDFile=/var/run/tinyproxy/tinyproxy.pid
 ExecStart=/usr/sbin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf
 ExecStop=/usr/bin/killall -9 tinyproxy
 [Install]
 ,7 → 1509,7
 [Service]
 Type=exec
 PIDFile=/run/nfcapd/nfcapd.pid
-ExecStart=/usr/bin/nfcapd -w -D -b 127.0.0.1 -p 2055 -u nfcapd -g nfcapd -B 200000 -t 300 -S 7 -z -P /run/nfcapd/nfcapd.pid -I alcasar_netflow -l /var/log/nfsen/profile-data/live/alcasar_netflow
+ExecStart=/usr/bin/nfcapd -w -D -b 127.0.0.1 -p 2055 -u nfcapd -g nfcapd -B 200000 -t 300 -S 7 -z -P /var/run/nfcapd/nfcapd.pid -I alcasar_netflow -l /var/log/nfsen/profile-data/live/alcasar_netflow
 ExecReload=/bin/kill -HUP $MAINPID
 [Install]
 ,8 → 1516,9
 WantedBy=multi-user.target
 EOF
     [ -d /var/log/nfsen/profile-data/live/alcasar_netflow ] || mkdir -p /var/log/nfsen/profile-data/live/alcasar_netflow
-    [ -d /run/nfcapd ] || mkdir -p /run/nfcapd
-    chown -R nfcapd:nfcapd /var/log/nfsen /run/nfcapd
+    [ -d /var/run/nfcapd ] || mkdir -p /var/run/nfcapd
+    chown -R nfcapd:nfcapd /var/log/nfsen /var/run/nfcapd
+#    chown -R apache:apache /var/log/nfsen/profile-data/live/alcasar_netflow
 } # End of nfsen()
 ###########################################################
 ,7 → 1547,7
         cat << EOF > /etc/dnsmasq-whitelist.conf
 # Configuration file for "dnsmasq with whitelist"
 # ADD Toulouse university whitelist domains
-pid-file=/run/dnsmasq-whitelist.pid
+pid-file=/var/run/dnsmasq-whitelist.pid
 listen-address=127.0.0.1
 port=55
 no-dhcp-interface=lo
 ,7 → 1565,7
         mv /lib/systemd/system/dnsmasq.service /lib/systemd/system/dnsmasq.service.default
         cp /lib/systemd/system/dnsmasq.service.default /lib/systemd/system/dnsmasq-whitelist.service
         $SED "s?^ExecStart=.*?ExecStart=/usr/sbin/dnsmasq -C /etc/dnsmasq-whitelist.conf?g" /lib/systemd/system/dnsmasq-whitelist.service
-        $SED "s?^PIDFile=.*?PIDFile=/run/dnsmasq-whitelist.pid?g" /lib/systemd/system/dnsmasq-whitelist.service
+        $SED "s?^PIDFile=.*?PIDFile=/var/run/dnsmasq-whitelist.pid?g" /lib/systemd/system/dnsmasq-whitelist.service
 } # End of dnsmasq()
 #########################################################
 ,7 → 1758,7
         do
                 cp -f /lib/systemd/system/unbound.service /lib/systemd/system/unbound-$list.service
                 $SED "s?^ExecStart=.*?ExecStart=/usr/sbin/unbound -d -c /etc/unbound/unbound-$list.conf?g" /lib/systemd/system/unbound-$list.service
-                $SED "s?^PIDFile=.*?PIDFile=/run/unbound-$list.pid?g" /lib/systemd/system/unbound-$list.service
+                $SED "s?^PIDFile=.*?PIDFile=/var/run/unbound-$list.pid?g" /lib/systemd/system/unbound-$list.service
         done
         $SED "s?^After=.*?After=syslog.target network-online.target chilli.service dnsmasq-whitelist.service?g" /lib/systemd/system/unbound-whitelist.service
 } # End of unbound()
 ,7 → 1926,7
 # fail2ban unit
 [ -e /lib/systemd/system/fail2ban.service.default ] || cp /lib/systemd/system/fail2ban.service /lib/systemd/system/fail2ban.service.default
 $SED '/ExecStart=/a\ExecStop=/usr/bin/fail2ban-client stop' /usr/lib/systemd/system/fail2ban.service
-$SED '/Type=/a\PIDFile=/run/fail2ban/fail2ban.pid' /usr/lib/systemd/system/fail2ban.service
+$SED '/Type=/a\PIDFile=/var/run/fail2ban/fail2ban.pid' /usr/lib/systemd/system/fail2ban.service
 $SED '/After=*/c After=syslog.target network.target lighttpd.service' /usr/lib/systemd/system/fail2ban.service
 } # End of fail2ban()
 ,10 → 1996,10
 [Service]
 Type=forking
-ExecStart=/usr/bin/gammu-smsd --config /etc/gammu_smsd_conf --user=gammu_smsd --group=gammu_smsd --pid=/run/gammu-smsd.pid --daemon
+ExecStart=/usr/bin/gammu-smsd --config /etc/gammu_smsd_conf --user=gammu_smsd --group=gammu_smsd --pid=/var/run/gammu-smsd.pid --daemon
 ExecReload=/bin/kill -HUP $MAINPID
-ExecStopPost=/bin/rm -f /run/gammu-smsd.pid
-PIDFile=/run/gammu-smsd.pid
+ExecStopPost=/bin/rm -f /var/run/gammu-smsd.pid
+PIDFile=/var/run/gammu-smsd.pid
 [Install]
 WantedBy=multi-user.target

 /scripts/alcasar-uninstall.sh
 ,7 → 120,7
         if [ -e /etc/init.d/havp ]
         then
                 [ -e /etc/havp/havp.config.default ] && mv /etc/havp/havp.config.default /etc/havp/havp.config && echo -n "1, "
-                [ -d /run/havp ] && rm -rf /run/havp && echo -n "2, "
+                [ -d /var/run/havp ] && rm -rf /var/run/havp && echo -n "2, "
                 [ -e /etc/init.d/havp.default ] && mv /etc/init.d/havp.default /etc/init.d/havp && echo -n "3, "
                 [ -e /lib/systemd/system/havp.service ] && rm /lib/systemd/system/havp.service && echo -n "4, "
                 [ -e /etc/freshclam.conf.default ] && mv /etc/freshclam.conf.default /etc/freshclam.conf && echo -n "5, "
 ,7 → 135,7
         if [ -e /etc/init.d/tinyproxy ]
         then
                 [ -e /etc/tinyproxy/tinyproxy.conf.default ] && mv /etc/tinyproxy/tinyproxy.conf.default /etc/tinyproxy/tinyproxy.conf && echo -n "1, "
-                [ -d /run/tinyproxy ] && rm -rf /run/tinyproxy && echo -n "2, "
+                [ -d /var/run/tinyproxy ] && rm -rf /var/run/tinyproxy && echo -n "2, "
                 userdel -r tinyproxy 2>/dev/null && echo -n "3"
         else echo -n "already uninstalled"
         fi
 ,7 → 195,7
 cron ()
 {
 # /etc/cron.d/alcasar-daemon-watchdog is removed at the beginning of this script
-echo -en "(13) : "
+echo -en "(11) : "
         i=1
         for cron in `ls /etc/cron.d/alcasar-* 2>/dev/null`
         do
 ,8 → 202,8
                 rm $cron && echo -n "$i, "
                 i=`expr $i + 1`
         done
-        [ -e /etc/crontab.default ] && mv /etc/crontab.default /etc/crontab && echo -n "12, "
-        [ -e /etc/anacrontab.default ] && mv /etc/anacrontab.default /etc/anacrontab && echo -n "13"
+        [ -e /etc/crontab.default ] && mv /etc/crontab.default /etc/crontab && echo -n "10, "
+        [ -e /etc/anacrontab.default ] && mv /etc/anacrontab.default /etc/anacrontab && echo -n "11"
 }
 fail2ban ()

 /scripts/alcasar-CA.sh
 ,9 → 223,7
 (cat $SRVKEY; echo; cat $SRVCERT) > $SRVPEM
 cp -f $CACERT $SRVCHAIN
-# Limit rights
-chown -R root:root $SRVKEY $CAKEY
-chmod -R 0600 $SRVKEY $CAKEY
+chmod a+r $CACERT $SRVCERT $SRVCHAIN
 # Link certs in ALCASAR Control Center
 if [ -s "$CACERT" -a -s "$CAKEY" -a -s "$SRVCERT" -a -s "$SRVKEY" ];

 /scripts/alcasar-load_balancing.sh
 ,7 → 21,7
 prog="alcasar-load_balancing.sh"
-pidfile="/run/alcasar-load_balancing.pid"
+pidfile="/var/run/alcasar-load_balancing.pid"
 ###############################
 # MAIN PARAMETERs Configuration

/web/acc/phpsysinfo/data/ModelTranslation.txt
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/web/acc/phpsysinfo/gfx/html.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/sort_both.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/attention.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/prev.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/bullet_toggle_plus.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/bullet_toggle_minus.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/sort_asc.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/ajax-loader.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/down_gray.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/next.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/logo_32.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/reload.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/htmlwarn.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/favicon.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/right_gray.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/favicon.ico
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/body.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/blank.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/right_black.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/close.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/ajaxLoader.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/sort_desc.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/gfx/down_black.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/templates/aqua/aq_background.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/templates/blue/bar.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/web/acc/phpsysinfo/templates/blue/title.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/web/acc/phpsysinfo/templates/blue/barwarn.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/web/acc/phpsysinfo/templates/blue/bg.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/web/acc/phpsysinfo/templates/cream/bg.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/templates/idash/html.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/templates/idash/htmlwarn.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/web/acc/phpsysinfo/templates/idash/bg.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/web/acc/phpsysinfo/templates/lingruby/background.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/web/acc/phpsysinfo/templates/nextgen/nextgen_bg.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/web/acc/phpsysinfo/templates/two/gradient.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/web/acc/phpsysinfo/tools/MakeRelease.sh
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:executable
-*
\ No newline at end of property

/web/acc/phpsysinfo/tools/check.sh
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:executable
-*
\ No newline at end of property

 /web/acc/admin/services.php
 ,7 → 27,7
         $l_freshclam            = "Mise à jour de l'antivirus (toutes les 4 heures)";
         $l_ntpd                 = "Service de mise à l'heure réseau";
         $l_fail2ban             = "Détecteur d'intrusion";
-        $l_nfcapd               = "Collecteur de flux NetFlow";
+        $l_nfsen                = "Grapheur de flux NetFlow";
         $l_vnstat               = "Grapheur de flux réseau";
         $l_havp                 = "Proxy Antivirus";
         $l_tinyproxy            = "Proxy HTTP léger";
 ,7 → 66,7
         $l_freshclam            = "Antivirus update process (every 4 hours)";
         $l_ntpd                 = "Network time server";
         $l_fail2ban             = "Intrusion Dectection System";
-        $l_nfcapd               = "Netflow collector";
+        $l_nfsen                = "Netflow grapher";
         $l_vnstat               = "Network grapher";
         $l_havp                 = "Antivirus Proxy";
         $l_tinyproxy            = "Light HTTP Proxy";
 ,7 → 137,7
 //-------------------------------
 // Actions on services
 //-------------------------------
-$autorizeService = array("radiusd","chilli","mysqld","lighttpd","unbound-forward","ulogd-ssh","ulogd-ext-access","ulogd-traceability","unbound-blacklist","unbound-whitelist","dnsmasq-whitelist","unbound-blackhole","e2guardian","havp","tinyproxy","clamav-freshclam","sshd","ntpd","fail2ban","nfcapd","vnstat");
+$autorizeService = array("radiusd","chilli","mysqld","lighttpd","unbound-forward","ulogd-ssh","ulogd-ext-access","ulogd-traceability","unbound-blacklist","unbound-whitelist","dnsmasq-whitelist","unbound-blackhole","e2guardian","havp","tinyproxy","clamav-freshclam","sshd","ntpd","fail2ban","nfsen","vnstat");
 $autorizeAction = array("start","stop","restart");
 if (isset($_GET['service'])&&(in_array($_GET['service'], $autorizeService))) {
 ,7 → 171,6
 $MainServiceStatus['mysqld'] = checkServiceStatus("mysqld");
 $MainServiceStatus['lighttpd'] = checkServiceStatus("lighttpd");
 $MainServiceStatus['unbound'] = checkServiceStatus("unbound");
-$MainServiceStatus['nfcapd'] = checkServiceStatus("nfcapd");
 $MainServiceStatus['ulogd_ssh'] = checkServiceStatus("ulogd-ssh");
 $MainServiceStatus['ulogd_ext_access'] = checkServiceStatus("ulogd-ext-access");
 $MainServiceStatus['ulogd_traceability'] = checkServiceStatus("ulogd-traceability");
 ,6 → 189,7
 $OptServiceStatus['sshd'] = checkServiceStatus("sshd");
 $OptServiceStatus['ntpd'] = checkServiceStatus("ntpd");
 $OptServiceStatus['fail2ban'] = checkServiceStatus("fail2ban");
+$OptServiceStatus['nfsen'] = checkServiceStatus("nfsen");
 $OptServiceStatus['vnstat'] = checkServiceStatus("vnstat");
 /****************
 *       MAIN    *

/rpms/x86_64/nfdump-1.6.19-1.mga7.x86_64.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/rpms/x86_64/nfdump-1.6.17-2.mga6.x86_64.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /rpms/rpm-build-howto
 ,17 → 17,17
 ****  For Coova-chilli   *****
 - retrieve the last tarball of coova-chilli (or the svn archive).
-- Untar it and test the compilation process ("sh ./bootstrap", "./configure --disable-static --enable-shared --enable-largelimits --enable-chilliredir --enable-chilliscript --with-poll --enable-dhcpopt --enable-libjson --enable-json        --enable-mdns --with-openssl", "make", "make install").
+- Untar it and test the compilation process ("sh ./bootstrap", "./configure --enable-json --enable-libjson --enable-mdns", "make", "make install").
 - all is in the /usr/local". Remove the instaled files ("make uninstall") and the binaries ("make clean").
-- rename the directory and compress it (ie : tar -cvzf coova-chilli-1.x.tar.gz coova-chilli-1.x). Copy this tarball in the directory ~/rpmbuild/SOURCES/.
+- rename the directory and compress it (ie : tar -cvzf coova-chilli-1.4.tar.gz coova-chilli-1.4). Copy this tarball in the directory ~/rpmbuild/SOURCES/.
 - copy the SPEC file from the ALCASAR archive to the directory ~/rpmbuild/SPEC
-- change to the directory ~/pmbuild/SPEC and run the RPM build process : "rpmbuild -bb coova-chilli.spec" (or rpmbuild -ba to create also the SRPMS)
+- change to the directory ~/pmbuild/SPEC and run the RPM build process excluding 'ssl' : "rpmbuild -bb coova-chilli.spec" (or rpmbuild -ba to create also the SRPMS)
 INFO : .spec modifications since Redhat RPM :
-        - add this 1st line : "%define _disable_ld_no_undefined 1" to avoid errors for unused variables (no more needed with V1.5)
+        - add this 1st line : "%define _disable_ld_no_undefined 1" to avoid errors for unused variables
         - for 64b version, add 2 lines with "lib64" directory on the section removing statics binaries (rm -rf $RPM_BUILD_ROOT/usr/lib/*.la)
         - remove from the archive the unuused files for ALCASAR (wpad.dat, wwwdir, etc. via la directive '%exclude')
-        - change %make (deprecated) with %make_build and change %makeinstall (deprecated) with %make_install
+        - change %make (deprecated) with %make_build and change %makeinstall (deprecated) with %make_install
 **** For HAVP ****
 - install the RPM of clamav-devel

 /rpms/nfdump.spec
 ,0 → 1,49
+%define         libname %mklibname %{name}
+Name:           nfdump
+Version:        1.6.17
+Release:        %mkrel 2
+Summary:        NetFlow collecting and processing tools
+License:        BSD
+Packager:       Richard REY (Rexy)
+Group:          Networking/Other
+Source0:        %{name}-%{version}.tar.gz
+BuildRequires:  lib64rrdtool-devel
+BuildRoot:      %{_tmppath}/%{name}-root
+Url:            https://github.com/phaag/nfdump
+%description
+The nfdump tools collect and process netflow data on the command line.
+They are part of the NFSEN project, which is explained more detailed at
+http://www.terena.nl/tech/task-forces/tf-csirt/meeting12/nfsen-Haag.pdf
+%prep
+rm -rf $RPM_BUILD_ROOT
+%setup -q
+%build
+./autogen.sh
+%define configure_args --enable-nfprofile --enable-nftrack --disable-rpath --disable-static
+%configure2_5x %{configure_args}
+%make_build
+%install
+%make_install
+chmod 0644 AUTHORS ChangeLog README.md
+rm -f %{buildroot}%{_libdir}/*.la
+%clean
+rm -rf $RPM_BUILD_ROOT
+%files
+%defattr(-,root,root)
+%license LICENSE
+%doc AUTHORS ChangeLog README.md
+%{_bindir}/*
+%{_libdir}/*
+%{_mandir}/man1/*
+%changelog
+* Sat Jun 22 2019 Richard REY <Rexy>
+- Version 1.6.17-2 for ALCASAR 3.4
+* Thu Jan 03 2019 Richard REY <Rexy>
+- Version 1.6.17 for ALCASAR 3.3.3

Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2775 → Rev 2774