From 3404cda0ab00f4093db524b2b3ae9c5e21069db1 Mon Sep 17 00:00:00 2001
From: Klas Arvidsson <klas.arvidsson@liu.se>
Date: Thu, 8 Oct 2020 17:06:26 +0200
Subject: [PATCH] squid devel rules for easy experimentation
---
files/squid/helpers/rules.d/default.rules | 2 +-
files/squid/helpers/squid-url-rewrite.py | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/files/squid/helpers/rules.d/default.rules b/files/squid/helpers/rules.d/default.rules
index 2d8a5dd..f5ec262 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 6df52a1..425e8f0 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")
--
GitLab