WebSVN – ALCASAR – Path Comparison – /

Ignore whitespace Rev 2776 → Rev 2775

 /alcasar.sh
 ,7 → 1332,6
 # 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
         cat <<EOF >> $DIR_DG/lists/urlregexplist
 # Bing - add 'adlt=strict'
 #"(^http://[0-9a-z]+\.bing\.[a-z]+[-/%.0-9a-z]*\?)(.*)"->"\1\2&adlt=strict"
 EOF
 ,7 → 1375,6
         $SED "s?^# SCANIMAGES.*?SCANIMAGES false?g" /etc/havp/havp.config               # doesn't scan image files
         $SED "s?^# SKIPMIME.*?SKIPMIME image\/\* video\/\* audio\/\*?g" /etc/havp/havp.config # doesn't scan some multimedia files
         $SED "s?^# SCANTEMPFILE.*?SCANTEMPFILE /var/tmp/havp/havp-XXXXXX?g" /etc/havp/havp.config               # Use our special tmp FS (memfs)
-        $SED "s?^# TEMPDIR.*?TEMPDIR /var/tmp/havp?g" /etc/havp/havp.config             # Use our special tmp FS (memfs)
 # skip checking of youtube flow (too heavy load / risk too low)
         [ -e /etc/havp/whitelist.default ] || cp /etc/havp/whitelist /etc/havp/whitelist.default
         echo "# Whitelist youtube flow" >> /etc/havp/whitelist
 ,8 → 1504,6
 [Service]
 Type=exec
-ExecStartPre=/bin/mkdir -p /run/nfcapd
-ExecStartPre=/bin/chown nfcapd:nfcapd /run/nfcapd
 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
 ExecReload=/bin/kill -HUP $MAINPID
 ,7 → 2029,7
 # Set permissions monitoring and enforcement
 cat <<EOF > /etc/security/msec/perm.local
-/var/log/firewall/                     root.apache     750
+/var/log/firefwall/                     root.apache     750
 /var/log/firewall/*                     root.apache     640
 /etc/security/msec/perm.local           root.root       640
 /etc/security/msec/level.local          root.root       640

/rpms/x86_64/wkhtmltopdf-0.12.3-2.mga5.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

 /scripts/alcasar-urpmi.sh
 ,7 → 15,7
 KERNEL="kernel-server-5.3.7-4.mga7-1-1.mga7"
 # ****** Alcasar needed RPMS - paquetages nécessaires au fonctionnement d'Alcasar ******
 # perl-Socket6 : needed by nfsen
-PACKAGES="vim-enhanced freeradius freeradius-mysql freeradius-ldap lighttpd lighttpd-mod_auth php-fpm php-gd php-ldap php-mysqli php-mbstring php-sockets php-curl php-pdo_sqlite php-cli php-rrd unbound e2guardian postfix mariadb ntp bind-utils openssh-server rng-utils rsync clamav fail2ban gnupg2 ulogd pm-fallback-policy ipset usb_modeswitch tinyproxy vnstat dos2unix p7zip msec kernel-userspace-headers kernel-firmware-nonfree dnsmasq dhcp-server tcpdump"
+PACKAGES="vim-enhanced freeradius freeradius-mysql freeradius-ldap lighttpd lighttpd-mod_auth php-fpm php-gd php-ldap php-mysqli php-mbstring php-sockets php-curl php-pdo_sqlite php-cli php-rrd unbound e2guardian postfix mariadb ntp bind-utils openssh-server rng-utils rsync clamav fail2ban gnupg2 ulogd pm-fallback-policy ipset usb_modeswitch tinyproxy vnstat dos2unix p7zip msec kernel-userspace-headers kernel-firmware-nonfree dnsmasq dhcp-server wkhtmltopdf tcpdump"
 rpm_repository_sync ()
 {

 /web/acc/admin/services.php
 ,7 → 24,7
         $l_mysqld               = "Serveur de la base des usagers";
         $l_lighttpd             = "Serveur WEB (Alcasar Control Center)";
         $l_sshd                 = "Accès sécurisée distant";
-        $l_clamav_freshclam     = "Mise à jour de l'antivirus (toutes les 4 heures)";
+        $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";
 ,7 → 63,7
         $l_mysqld               = "User database server";
         $l_lighttpd             = "WEB server (ALCASAR Control Center)";
         $l_sshd                 = "Secure remote access";
-        $l_clamav_freshclam     = "Antivirus update process (every 4 hours)";
+        $l_freshclam            = "Antivirus update process (every 4 hours)";
         $l_ntpd                 = "Network time server";
         $l_fail2ban             = "Intrusion Dectection System";
         $l_nfcapd               = "Netflow collector";
 ,7 → 184,7
 $FilterServiceStatus['e2guardian'] = checkServiceStatus("e2guardian");
 $FilterServiceStatus['havp'] = checkServiceStatus("havp");
 $FilterServiceStatus['tinyproxy'] = checkServiceStatus("tinyproxy");
-$FilterServiceStatus['clamav_freshclam'] = checkServiceStatus("clamav-freshclam");
+$FilterServiceStatus['clamav-freshclam'] = checkServiceStatus("clamav-freshclam");
 $OptServiceStatus = array();
 $OptServiceStatus['sshd'] = checkServiceStatus("sshd");

/web/acc/phpsysinfo/sample/plugin_bat/log_android412.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_bat/log_android422.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_bat/battery_state1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_bat/upower1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_bat/log_android233.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_bat/upower3.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_bat/upower2.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_bat/log_freebsd_1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_bat/upower4.txt
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/web/acc/phpsysinfo/sample/plugin_bat/log_freebsd_2.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_bat/upower5.txt
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/web/acc/phpsysinfo/sample/plugin_bat/log_test_2.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_bat/log_test_1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_bat/log_vbox.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_bat/log_LenovoT530.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_bat/battery_info1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_bat/log_darwin_1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_ps/ps1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_ps/ps2.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_psstatus/psstatus1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_quotas/quotas1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raiddmraid2.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raiddmraid3.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmdstat1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidzpool1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidzpool2.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidzpool3.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidzpool4.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidzpool5.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidzpool6.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidzpool7.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidzpool8.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidzpool9.txt
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/web/acc/phpsysinfo/sample/plugin_raid/raidmdstat5.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmdstat4.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmegactl4.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmegactl3.txt
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/web/acc/phpsysinfo/sample/plugin_raid/raidmegactl2.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmegactl1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmdstat9.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmdstat8.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidzpool10.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidzpool11.txt
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/web/acc/phpsysinfo/sample/plugin_raid/raidmegasasctl1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmegasasctl5.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmegasasctl4.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raiddmraid1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidgraid1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidgraid2.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmdstat3.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raiddmraid4.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raiddmraid5.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmdstat2.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmdstat7.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmdstat6.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raididrac1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmdstat10.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmdstat11.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmdstat12.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmdstat13.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmdstat14.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmdstat15.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidzpool12.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidzpool13.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmegasasctl3.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_raid/raidmegasasctl2.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_smart/smart0.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_smart/smart1.txt
File deleted

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

/web/acc/phpsysinfo/sample/plugin_smart/smart2.txt
File deleted

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

/web/acc/phpsysinfo/sample/processes/processes.txt
File deleted

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

/web/acc/phpsysinfo/sample/ups/1-upscl.txt
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/web/acc/phpsysinfo/sample/ups/powersoftplus1.txt
File deleted

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

/web/acc/phpsysinfo/sample/ups/1-upscDell2700.txt
File deleted

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

/web/acc/phpsysinfo/sample/ups/pmset.txt
File deleted

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

/web/acc/phpsysinfo/sample/ups/1-upscPW5110.txt
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/web/acc/phpsysinfo/sample/ups/apcaccess1.txt
File deleted

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

/web/acc/phpsysinfo/tools/speedfan/SpeedFanGet_src.zip
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/tools/speedfan/SpeedFanGet_bin.zip
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

 /conf/havp.service
 ,11 → 12,11
 [Service]
 RemainAfterExit=yes
-ExecStartPre=/bin/mkdir -p /run/havp
-ExecStartPre=/bin/chown -R havp:havp /run/havp /var/log/havp
-ExecStartPre=/bin/mkdir -p /run/havp
-ExecStartPre=/bin/chown -R havp:havp /run/havp /var/log/havp
-PIDFile=/run/havp/havp.pid
+ExecStartPre=/bin/mkdir -p /var/run/havp
+ExecStartPre=/bin/chown -R havp:havp /var/run/havp /var/log/havp
+ExecStartPre=/bin/mkdir -p /var/run/havp
+ExecStartPre=/bin/chown -R havp:havp /var/run/havp /var/log/havp
+PIDFile=/var/run/havp/havp.pid
 ExecStart=/etc/init.d/havp start
 ExecStop=/etc/init.d/havp stop
 ExecReload=/etc/init.d/havp restart

 /conf/havp-init
 ,7 → 15,7
 . /etc/init.d/functions
 HAVP_BIN=/usr/sbin/havp
 HAVP_CONFIG=/etc/havp/havp.config
-PIDFILE=/run/havp/havp.pid
+PIDFILE=/var/run/havp/havp.pid
 NAME=havp
 DESC=havp

Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2776 → Rev 2775