diff --git a/files/squid/helpers/rules.d/default.rules b/files/squid/helpers/rules.d/default.rules index 2d8a5dd3357e8b8334c4fb9bd9d48aad0c3b8e84..f5ec262d66159cc41259ca02341dcd7df07e33b6 100644 --- a/files/squid/helpers/rules.d/default.rules +++ b/files/squid/helpers/rules.d/default.rules @@ -4,7 +4,7 @@ ^https?://www\.ida\.liu\.se/~examadmx?/.* true ^https?://www\.ida\.liu\.se/edu/ugrad/datortenta/.* true ^https?://help\.opera\.com/errorpage/.* true -^https?://tentix\.ida\.liu\.se:3128/squid-internal-mgr/info true +^https?://exam\.ida\.liu\.se:3128/squid-internal-mgr/info true // Firefox ^https?://detectportal\.firefox\.com/success\.txt true diff --git a/files/squid/helpers/squid-url-rewrite.py b/files/squid/helpers/squid-url-rewrite.py index 6df52a1ccf856d702dca160f9bfe1c14181fe611..425e8f07e8fa868c746dc7ec73f3263bab1b97d0 100755 --- a/files/squid/helpers/squid-url-rewrite.py +++ b/files/squid/helpers/squid-url-rewrite.py @@ -72,6 +72,11 @@ def load_rules(ruleset, filename): def main(): ruleset = list() + + devel_rules = basedir + "/../devel.rules" + if 'devel' in hostname and os.path.isfile(devel_rules): + load_rules(ruleset, devel_rules) + # load opendsa first to let it override default rules load_rules(ruleset, basedir + "/rules.d/opendsa.rules") load_rules(ruleset, basedir + "/rules.d/default.rules")