From 5dbeee83535a88474ae1b1e68fb8eeb034db5e24 Mon Sep 17 00:00:00 2001
From: Klas Arvidsson <klas.arvidsson@liu.se>
Date: Wed, 18 Dec 2019 23:08:45 +0100
Subject: [PATCH] new certificate and default rule for edu/ugrad/datortenta

---
 files/squid/helpers/rules.d/default.rules | 2 +-
 files/squid/squid.conf                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/squid/helpers/rules.d/default.rules b/files/squid/helpers/rules.d/default.rules
index b0f6471..2d8a5dd 100644
--- a/files/squid/helpers/rules.d/default.rules
+++ b/files/squid/helpers/rules.d/default.rules
@@ -2,7 +2,7 @@
 
 ^https?://www\.ida\.liu\.se/mall11/.*   true
 ^https?://www\.ida\.liu\.se/~examadmx?/.*           true
-^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
 
diff --git a/files/squid/squid.conf b/files/squid/squid.conf
index 23e1064..3362b6f 100644
--- a/files/squid/squid.conf
+++ b/files/squid/squid.conf
@@ -115,7 +115,7 @@ http_access deny all
 
 # Squid normally listens to port 3128
 # http_port 3128
-http_port 3128 ssl-bump generate-host-certificates=on dynamic_cert_mem_cache_size=4MB cert=/usr/libexec/squid/helpers/certificate/Oct18-Oct19/myCA.pem
+http_port 3128 ssl-bump generate-host-certificates=on dynamic_cert_mem_cache_size=4MB cert=/usr/libexec/squid/helpers/certificate/Oct19-Oct20/myCA.pem
 always_direct allow all
 ssl_bump server-first all
 
-- 
GitLab