| /CHANGELOG |
|---|
| 1,6 → 1,15 |
| # $Id$ |
| ********** ALCASAR CHANGELOG ********** |
| -------------------- 3.6.0 -------------------- |
| --------------- SVN revision: ------------ |
| NEWS |
| - Mageia 8 |
| CHANGES |
| ACC |
| BUGS |
| - Replace deprecated php functions (php7 --> php8) |
| -------------------- 3.5.5 -------------------- |
| --------------- SVN revision: 3071 ------------ |
| NEWS |
| /VERSION |
|---|
| 1,0 → 0,0 |
| 3.5.5 |
| 3.6.0b |
| /alcasar.sh |
|---|
| 148,7 → 148,7 |
| exit 1 |
| fi |
| IFS="$old" |
| if [[ ( $unknown_os != 3 ) || ("$DISTRIBUTION" != "Mageia" ) || ( "$CURRENT_VERSION" != "7" ) ]] |
| if [[ ( $unknown_os != 3 ) || ("$DISTRIBUTION" != "Mageia" ) || (( "$CURRENT_VERSION" != "7" ) && ( "$CURRENT_VERSION" != "8" ))]] |
| then |
| if [ -e /var/tmp/alcasar-conf.tar.gz ] # update |
| then |
| 157,12 → 157,12 |
| then |
| echo "La mise à jour automatique d'ALCASAR ne peut pas être réalisée." |
| echo "1 - Effectuez une sauvegarde des fichiers de traçabilité et de la base des usagers via l'ACC" |
| echo "2 - Installez Linux-Mageia 7.1 (64bits) et ALCASAR (cf. doc d'installation)" |
| echo "2 - Installez Linux-Mageia 8 et ALCASAR (cf. doc d'installation)" |
| echo "3 - Importez votre base des usagers" |
| else |
| echo "The automatic update of ALCASAR can't be performed." |
| echo "1 - Save your traceability files and the user database" |
| echo "2 - Install Linux-Mageia 7.1 (64bits) & ALCASAR (cf. installation doc)" |
| echo "2 - Install Linux-Mageia 8 & ALCASAR (cf. installation doc)" |
| echo "3 - Import your users database" |
| fi |
| else |
| 173,8 → 173,8 |
| fi |
| echo |
| if [ $Lang == "fr" ] |
| then echo "Le système d'exploitation doit être remplacé (Mageia7.1-64bits)" |
| else echo "The OS must be replaced (Mageia7.1-64bits)" |
| then echo "Le système d'exploitation doit être remplacé (Mageia8)" |
| else echo "The OS must be replaced (Mageia8)" |
| fi |
| exit 1 |
| fi |
| 1296,7 → 1296,10 |
| $SED "s?^#mapauthtoports =.*?mapauthtoports = off?g" $DIR_DG/e2guardian.conf |
| # Enable clamd scanner |
| $SED "s?^#contentscanner = '/etc/e2guardian/contentscanners/clamdscan.conf'?contentscanner = '/etc/e2guardian/contentscanners/clamdscan.conf'?g" $DIR_DG/e2guardian.conf |
| # Set Max RAM cache to 10Mb |
| $SED "s?^maxcontentramcachescansize =.*?maxcontentramcachescansize = 10240?g" $DIR_DG/e2guardian.conf |
| # Set Max file size cache to 20Mb |
| $SED "s?^maxcontentfilecachescansize =.*?maxcontentfilecachescansize = 20480?g" $DIR_DG/e2guardian.conf |
| # Adapt the first group conf file |
| [ -e $DIR_DG/e2guardianf1.conf.default ] || cp $DIR_DG/e2guardianf1.conf $DIR_DG/e2guardianf1.conf.default |
| $SED "s/^reportinglevel =.*/reportinglevel = 3/g" $DIR_DG/e2guardianf1.conf |
| 1490,7 → 1493,7 |
| # vnstat-dashboard |
| $SED "s?^\$thisInterface.*?\$thisInterface = \"$EXTIF\";?" $DIR_ACC/manager/vnstat/index.php |
| cp /lib/systemd/system/vnstat.service /etc/systemd/system/vnstat.service |
| $SED "s?^PIDFile=.*?PIDFile=/run/vnstat/vnstat.pid?g" /etc/systemd/system/vnstat.service |
| $SED "s?^ReadWritePaths=.*?ReadWritePaths=/var/log?g" /etc/systemd/system/vnstat.service |
| } # End of vnstat() |
| ################################################################### |
| /rpms/coova-chilli-1.6.spec |
|---|
| 1,4 → 1,5 |
| %define _disable_ld_no_undefined 1 |
| %define _unpackaged_files_terminate_build 0 |
| Summary: CoovaChilli is an open-source software access controller for captive portal hotspots |
| Name: coova-chilli |
| 78,6 → 79,8 |
| %exclude %{_libdir}/python/CoovaChilliLib.py* |
| %changelog |
| * Sat Jul 23 2022 Richard REY (aka Rexy) - 1.6-1.mga8 |
| - 1.6 release |
| * Wed Feb 24 2021 Richard REY (aka Rexy) - 1.6-1.mga7 |
| - 1.6 release |
| * Fri May 22 2020 Richard REY (aka Rexy) - 1.5-1.mga7 |
| /rpms/x86_64/coova-chilli-1.6-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/wget-1.20.3-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/coova-chilli-1.6-1.mga8.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/x86_64/wget-1.21.3-1.mga8.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 |
| /scripts/alcasar-rpm.sh |
|---|
| 9,19 → 9,19 |
| Lang=`echo $LANG|cut -c 1-2` |
| SED="/bin/sed -i" |
| VERSION="7" |
| VERSION="8" |
| ARCH="x86_64" |
| # The kernel version we compile netflow for |
| KERNEL="kernel-server-5.10.46-1.mga7-1-1.mga7" |
| KERNEL="kernel-server-5.15.65-1.mga8-1-1.mga8" |
| # ****** Alcasar needed RPMS - paquetages nécessaires au fonctionnement d'Alcasar ****** |
| # (old) perl-Socket6 : needed by nfsen |
| # "fonts-dejavu-common" & "fonts-ttf-dejavu" : fonts needed by wkhtmltopdf |
| # "lsscsi" & nvme-cli" : needed by phpsysinfo |
| # "lsscsi" & nvme-cli" & "php-dom" : needed by phpsysinfo |
| # "socat" : avoid a warning when run the install script of letsencrypt ("acme.sh") |
| # "sudo" : needed after a reinstallation (to be investigated) |
| # "clamav" + "clamav-db" : needed because of a lack of mutual dependance |
| # "postfix" + "cyrus-sasl" + "lib64sasl2-plug-plain" : email registration method |
| 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 unbound e2guardian postfix mariadb ntp bind-utils openssh-server rng-utils rsync clamav clamav-db clamd fail2ban gnupg2 ulogd ipset usb_modeswitch vnstat dos2unix p7zip msec kernel-userspace-headers kernel-firmware-nonfree dnsmasq dhcp-server tcpdump fonts-dejavu-common fonts-ttf-dejavu lsscsi nvme-cli sudo socat postfix cyrus-sasl lib64sasl2-plug-plain iftop" |
| 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-dom unbound e2guardian postfix mariadb ntp bind-utils openssh-server rng-utils rsync clamav clamav-db clamd fail2ban gnupg2 ulogd ipset usb_modeswitch vnstat dos2unix p7zip msec kernel-userspace-headers kernel-firmware-nonfree dnsmasq dhcp-server tcpdump fonts-dejavu-common fonts-ttf-dejavu lsscsi nvme-cli sudo socat postfix cyrus-sasl lib64sasl2-plug-plain iftop" |
| rpm_repository_sync () |
| { |