diff --git a/files/squid/helpers/rules.d/opendsa.rules b/files/squid/helpers/rules.d/opendsa.rules index 724eedbdae57aef32333fb75a67ea981a419afd9..893734b0a01403d2f91b60e15b985d96e14c6511 100644 --- a/files/squid/helpers/rules.d/opendsa.rules +++ b/files/squid/helpers/rules.d/opendsa.rules @@ -1,7 +1,5 @@ // OpenDSA -// ^.* false - ^https?://www\.ida\.liu\.se/edu/ugrad/datortenta/OpenDSA/Books/TDDD86_200317/.* true ^https?://www\.ida\.liu\.se/edu/ugrad/datortenta/OpenDSA/Books/.* false diff --git a/files/squid/helpers/squid-url-rewrite.py b/files/squid/helpers/squid-url-rewrite.py index c827c184d5513bfdf3af8c82031bc8a6cf94f165..92b01a7b9ba60c5e35dcc2b90103d890fe5a563b 100755 --- a/files/squid/helpers/squid-url-rewrite.py +++ b/files/squid/helpers/squid-url-rewrite.py @@ -74,6 +74,10 @@ def main(): ruleset = list() + block_all = basedir + "/../BLOCK_ALL" + if os.path.isfile(block_all): + ruleset.append( ["^.*", False] ) + devel_rules = basedir + "/../devel.rules" if 'devel' in hostname and os.path.isfile(devel_rules): load_rules(ruleset, devel_rules)