Update to 2023-06-29 10:00

This commit is contained in:
Daniel Berteaud
2023-06-29 10:00:34 +02:00
parent 0df76a72de
commit 3e527570d2
53 changed files with 336 additions and 107 deletions

View File

@@ -10,6 +10,12 @@
notify: restart squid
tags: proxy
# Before 1.34.6-3 provided by EPEL, the service was handled by a init script and the service was named ufdb
- name: Check if the systemd unit is installed
stat: path=/lib/systemd/system/ufdbGuard.service
register: squid_ufdb_unit
tags: proxy
- name: Identify intercept HTTP ports (if any)
set_fact: squid_intercept_http_ports={{ squid_http_ports | selectattr('port','defined') | selectattr('mode','defined') | selectattr('mode','equalto','intercept') | map(attribute='port') | list }}
tags: firewall,proxy
@@ -246,12 +252,6 @@
service: name=squid-clamd state={{ squid_scan_av | ternary('started','stopped') }} enabled={{ squid_scan_av | ternary(True,False) }}
tags: proxy
# Before 1.34.6-3 provided by EPEL, the service was handled by a init script and the service was named ufdb
- name: Check if the systemd unit is installed
stat: path=/lib/systemd/system/ufdbGuard.service
register: squid_ufdb_unit
tags: proxy
- name: Handle ufdb daemon
service: name={{ squid_ufdb_unit.stat.exists | ternary('ufdbGuard','ufdb') }} state={{ squid_filter_url | ternary('started','stopped') }} enabled={{ squid_filter_url | ternary(True,False) }}
tags: proxy

View File

@@ -1,7 +1,7 @@
#!/bin/sh
{% if squid_ufdb_update_from_univ %}
/usr/bin/rsync -rzPq ftp.univ-tlse1.fr::blacklist/dest/ /var/ufdbguard/blacklists/
/usr/bin/rsync -rzPq ftp.ut-capitole.fr::blacklist/dest/ /var/ufdbguard/blacklists/
{% endif %}
find /var/ufdbguard/blacklists/ -mindepth 1 -maxdepth 1 -type d -exec basename "{}" \;| while read CATEGORY; do
@@ -16,5 +16,5 @@ find /var/ufdbguard/blacklists/ -mindepth 1 -maxdepth 1 -type d -exec basename "
eval $CMD 2>/dev/null
fi
done
systemctl restart ufdb
systemctl restart {{ squid_ufdb_unit.stat.exists | ternary('ufdbGuard','ufdb') }}
exit 0