Subversion Repositories ALCASAR

Compare Revisions

No changes between revisions

Ignore whitespace Rev 2967 → Rev 2968

/CHANGELOG
5,6 → 5,7
NEWS
- Multi-WAN access with load balancing per user (Thx to Pierre RIVAULT for this great job)
CHANGES
- kernel 5.10.46 + ipt_NETFLOW 2.6 + ACME 2.9.0 (letsencrypt)
- Bypass mode works now also in dhcp
- After the system has been updated (every day at 3 am), check if reboot is needed
BUGS
/conf/letsencrypt-client/acme.sh-2.8.8.tar.gz
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/letsencrypt-client/acme.sh-2.9.0.tar.gz
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/ipt-netflow-2.5.1.spec
File deleted
/rpms/ipt-netflow-2.6.spec
0,0 → 1,82
%define kversion 5.10.46-server-1.mga7
%define debug_package %{nil}
Name: ipt-netflow
Version: 2.6
Release: %mkrel 0
Summary: Netflow iptables module for Linux kernel
License: GPLv2
Packager: Richard REY (Rexy)
Group: System/Networking
URL: https://github.com/aabc/ipt-netflow
BuildRequires: iptables-devel
Source0: %name-%version.tgz
 
%description
High performance NetFlow v5, v9, IPFIX flow data export module for Linux kernel.
Created to be useful for highly loaded linux router. It should be used as iptables target.
 
%prep
%setup -q -n ipt-netflow-%{version}
 
%build
./configure --disable-dkms --disable-snmp-agent
%make_build
 
%install
%make_install
mkdir -p %{buildroot}/lib64/iptables
mkdir -p %{buildroot}/lib/modules/%kversion/extra
cp ~/rpmbuild/BUILD/%name-%version/libipt_NETFLOW.so %{buildroot}/lib64/iptables/
cp ~/rpmbuild/BUILD/%name-%version/libip6t_NETFLOW.so %{buildroot}/lib64/iptables/
cp ~/rpmbuild/BUILD/%name-%version/ipt_NETFLOW.ko %{buildroot}/lib/modules/%kversion/extra/
%clean
rm -rf %{buildroot}
 
%post
/sbin/depmod -a %kversion
 
%postun
/sbin/depmod -a %kversion
 
%files
/lib64/iptables/libipt_NETFLOW.so
/lib64/iptables/libip6t_NETFLOW.so
/lib/modules/%kversion/extra/ipt_NETFLOW.ko
 
%changelog
* Tue Jul 08 2021 Richard REY <Rexy>
- Version 2.6 for the kernel 5.10.46 (ALCASAR 3.5.4)
* Wed Feb 24 2021 Richard REY <Rexy>
- Version 2.5.1-2 for the kernel 5.10.30 (ALCASAR 3.5.3)
* Sat Oct 17 2020 Richard REY <Rexy>
- Version 2.5.1-1 for the kernel 5.7.19 (ALCASAR 3.5.1)
* Fri May 22 2020 Richard REY <Rexy>
- Version 2.5 for the kernel 5.6.14 (ALCASAR 3.5)
* Tue May 21 2019 Richard REY <Rexy>
- Version 2.4 for the kernel 4.14.131 (ALCASAR 3.4)
* Wed Jan 02 2019 Richard REY <Rexy>
- Version 2.3 for the kernel 4.14.89 (ALCASAR 3.3.3)
* Sun Nov 04 2018 Richard REY <Rexy>
- Version 2.3 for the kernel 4.14.74 (ALCASAR 3.3.2)
* Sun Aug 19 2018 Richard REY <Rexy>
- Version 2.3 for the kernel 4.14.69 (ALCASAR 3.3.1)
* Wed Jul 25 2018 Richard REY <Rexy>
- Version 2.3 for the kernel 4.14.56 (ALCASAR 3.3)
* Mon Feb 26 2018 Tom Houdayer
- Version 2.2 for the kernel 4.14.20 (ALCASAR 3.2.1)
* Wed Oct 11 2017 Tom Houdayer
- Version 2.2 for the kernel 4.9.50 (ALCASAR 3.2)
* Mon Jul 03 2017 Richard Rey <rexy>
- Version 2.1 for the kernel 4.4.74 (alcasar 3.1.3)
* Sun May 28 2017 Richard Rey <rexy>
- Version for the kernel 4.4.68 (alcasar 3.1.2)
* Thu Apr 06 2017 Richard Rey <rexy>
- Version for the kernel 4.4.59 (alcasar 3.1.1)
* Mon Mar 27 2017 Richard Rey <rexy>
- Version for the kernel 4.4.55 (alcasar 3.1)
* Sat Oct 29 2016 Richard Rey <rexy>
- Version for the kernel 4.4.26 (alcasar 3.0)
* Sat May 14 2016 Richard Rey <rexy>
- Version for the kernel 4.4.13
* Tue Apr 05 2016 Richard Rey <rexy>
- Initial version of the package
/rpms/rpm-build-howto
40,8 → 40,8
- rpmbuild -bb ***.spec
 
**** For ipt_netflow ****
- Must be complied on a system which runs the target kernel. So install manually the targeted kernel and reboot (ipt_NETFLOW will not load during this reboot)
- install the RPMs "kernel-server-devel" (choose the targeted kernel), "lib64iptables-devel (or libiptables-devel in 32b arch)"
- Must be complied on a system which runs the target kernel. So install manually the targeted kernel and the same version of kernel-userspace-headers and reboot (ipt_NETFLOW will not load during this reboot)
- install the RPMs "kernel-server-devel" (choose the targeted kernel), "lib64iptables-devel"
- download, uncompress and test the compilation of the last version of ipt-netflow (./configure --disable-dkms --disable-snmp-agent, make all install). The module is compiled in the same directory. The libs are copied in the /lib64/iptables (libip6t_NETFLOW.so & libipt_NETFLOW.so)
- test the module : go to the directory of sources and try to load it (modprobe ipt_NETFLOW), look at "journalctrl -f" to verify. Run "alcasar-iptables.sh" to reload netfilter rules (no errors should appear). Run "alcasar-daemon.sh" to verify that all is ok.
- if all is ok, copy the tarball in rpmbuild/SOURCES.
/rpms/x86_64/ipt-netflow-2.5.1-2.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/ipt-netflow-2.6-0.mga7.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-download.sh
11,7 → 11,7
VERSION="7"
ARCH="x86_64"
# The kernel version we compile netflow for
KERNEL="kernel-server-5.10.30-1.mga7-1-1.mga7"
KERNEL="kernel-server-5.10.46-1.mga7-1-1.mga7"
# ****** Alcasar needed RPMS - paquetages nécessaires au fonctionnement d'Alcasar ******
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 clamd clamav clamav-db fail2ban gnupg2 ulogd pm-fallback-policy 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"
 
/scripts/alcasar-rpm.sh
11,7 → 11,7
VERSION="7"
ARCH="x86_64"
# The kernel version we compile netflow for
KERNEL="kernel-server-5.10.30-1.mga7-1-1.mga7"
KERNEL="kernel-server-5.10.46-1.mga7-1-1.mga7"
# ****** 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
/web/acc/manager/htdocs/user_accounting.php
46,7 → 46,7
$pagesize = (isset($pagesize) && $pagesize) ? $pagesize : 10;
if (!is_numeric($pagesize) && $pagesize != 'all')
$pagesize = 10;
$limit = ($pagesize == 'all') ? '' : "$pagesize";
$limit = ($pagesize == 'all') ? 'ALL' : "$pagesize";
$selected[$pagesize] = 'selected';
$order = (isset($order) && $order != '') ? $order : $config['general_accounting_info_order'];
if ($order != 'desc' && $order != 'asc')