[continued from previous message]

header templates (required for e2guardian filter config generation).
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Rename variable
and cmdline option (REMOVE_BLACKLIST -> REMOVE_BLACKLISTS,
--remove-blacklist -> --remove-blacklists).
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Use more
similar path names.
- bin/debian-edu-router_refresh-blacklists_squid.sh: Use different path for
squid ACL filterlists and Uni Toulouse derived URL blacklists and
whitelists.
- d-e-r-p.c-f: Make filterlists processor (e2guardian vs. squid) depend on
whether SSL bumping is enabled (then: e2guardian) or disabled (then:
squid).
- debian/debian-edu-router-plugin.content-filter.postinst: Use previously
defined variables (and harden some variable syntax).
- debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Add support
for migrating data created by previous script versions.
- data/blacklists-toulouse.{e2guardian,squid}: Ship different configuration
sets for filterlists by Uni Toulouse (depending on whether used by
e2guardian or squid).
- debian/debian-edu-router-plugin.content-filter.postinst: Add support for
switching between filterlist provides (squid vs. e2guardian).
- conf/debian-edu-router-plugins/d-e-r-p.content-filter.sh: Add loginmenu
option for removing filterlists.
- bin/debian-edu-router_refresh-blacklists_squid.sh: During
remove_blacklist_files() assure that also symlinks get
removed/cleaned-up.
- bin/debian-edu-router_refresh-blacklists_squid.sh: Only mark
FILTERLISTS_PATH with work-in-progress if filterlists get
updated/downloaded.
- bin/debian-edu-router_refresh-blacklists_squid.sh: Ensure that
CURRENT_SQUID_DIR exists / is empty only if filterlists get
updated/downloaded.
- bin/debian-edu-router_refresh-blacklists_squid.sh: Ensure filterlist
directories exist, even if not populated (because all categories are
commented out).
- bin/debian-edu-router_refresh-blacklists_squid.sh: Silence script
entirely if nothing happens (e.g. if in default UPDATE_FILTERLISTS mode
and no filterlists have been downloaded so far).
- bin/debian-edu-router_refresh-blacklists_squid.sh: Typo fix in variable
name.
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Notify
about what filterlist mechanism is being cleaned up in
REMOVE_FILTERLISTS mode.
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Add
support for skipping service restarts.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Also activate
whitelists if any.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Drop log message
'Updating blacklists...'. This does not apply in REMOVE_FILTERLISTS
mode.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Only download
filterlists from Uni Toulouse if not in REMOVE_FILTERLISTS mode.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Curate
(add/remove) filterlist includes via symlinks in
/etc/debian-edu-router/e2guardian.d/lists/common/.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Catch grep
non-zero exitcode (and ignore it). This can happen if all categories in
a category list are all commented out. Without this, the script aborts
silently on a fully commented-out category file.
- bin/debian-edu-router_refresh-blacklists_squid.sh: Indentation fixup in
generate_squid_acl_file() function.
- debian/debian-edu-router-plugin.content-filter.prerm: Use
'debian-edu-router_refresh-blacklists --purge-filterlists' (the wrapper
script + purge) instead of individual scripts and the '...
--remove-filterlists' cmdline arg.
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Add
support for purging filterlists.
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Rename
variables (blacklists -> filterlists).
- conf/debian-edu-router-plugins/d-e-r-p.content-filter.sh: Edit selected
categories depending on which service (squid, e2guardian) is in charge
of blacklisting/whitelisting.
- bin/debian-edu-router_refresh-blacklists_squid.sh: Make the
one-category-per-line categories files the primary source of truth and
derive a shellinclude .sh file from it for sourcing.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Skip
blacklisted/whitelisted categories (e2guardian) if not listed in
default_selected_{blacklisted,whitelisted}_categories.
- debian/debian-edu-router-plugin.content-filter.install: Install
default_selected_{blacklisted,whitelisted}_categories to DATADIR (and
not to LOCALSTATEDIR).
- bin/debian-edu-router_{acl-watcher.sh,refresh-blacklists_e2guardian.sh}:
Log exactly what service restarts happen when updating filterlists.
- data/blacklists-toulouse.squid/selected_categories/
default_selected_blacklisted_categories: Warn about enabling too many
filtering categories when using squid-based filtering.
.
[ Daniel Teichmann ]
* Bring back e2guardian filterlist support (and various related fixes)
if SSL bumping is enabled, support fluent switching between e2guardian
and squid filterlists:
- debian/d-e-r-p.c-f.postinst: Do not purge filterlists, but remove them, to
save category selection files. (When switching between e2guardian and
squid based filtering).
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Keep
LISTS_DIR and WORK_DIR in REMOVE_FILTERLISTS mode, only wipe them in
PURGE_FILTERLISTS mode.
- data/templates/header_{black, white}listed_categories: Update copyright
header again.
- bin/d-e-r_refresh-blacklists_squid.sh: Actually remove 26th Squid ACL
snippet file ${SNIPPETS_PATH}/26_squid_acls.toulouse_d-e-r-p.c-f.conf
if not in use.
- bin/debian-edu-router_refresh-blacklists.sh: Add d-e-r common shell
functions / variables.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Only do
notice_log, if its actually appropriate.
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: If script
is not used, show this at least in a single notice_log line of output.
- conf/debian-edu-router-plugins/d-e-r-p.content-filter.sh: Show the type of
filterlists (e2guardian vs. squid) in the MANUALLY_REFRESH_BLISTS
loginmenu item.
- conf/debian-edu-router-plugins/d-e-r-p.content-filter.sh: Improve inline
docs. Make it easier to recognize menu item names.
- bin/debian-edu-router_refresh-blacklists*.sh: Move squid ACL watcher
inhibitor and re-trigger code into bin/debian-edu-router_refresh-
blacklists.sh wrapper script.
- The squid ACL watcher re-trigger is also required when switching away from
squid-based filterlists over to e2guardian-based filterlists. Checksums-Sha1:
272cff45fad655b1fb95d6aca4a89ea8fbc53cdc 2547 debian-edu-router_2.13.0.dsc
31f089cbd83928893b443de109ddb0d36d5c747c 1130184 debian-edu-router_2.13.0.tar.xz

[continued in next message]

--- SoupGate-Win32 v1.05
* Origin: you cannot sedate... all the things you hate (1:229/2)