daily-psk: make qr-code url configurablechange-92

6 files changed, 9 insertions, 4 deletions

diff --git a/daily-psk.capsman b/daily-psk.capsman
index 81cb5a2..17a09e1 100644
--- a/daily-psk.capsman
+++ b/daily-psk.capsman
@@ -14,6 +14,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :global DailyPskMatchComment;
+:global DailyPskQrCodeUrl;
 :global Identity;
 
 :global LogPrintExit2;
@@ -80,7 +81,7 @@ $WaitFullyConnected;
 
       :if ($Skip = 0) do={
         :set Seen ($Seen, $Ssid);
-        :local Link ("https://www.eworm.de/cgi-bin/cqrlogo-wifi.cgi" . \
+        :local Link ($DailyPskQrCodeUrl . \
             "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]);
         $SendNotification2 ({ origin=$0; \
           subject=([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid); \
diff --git a/daily-psk.local b/daily-psk.local
index 2af2414..17a60f7 100644
--- a/daily-psk.local
+++ b/daily-psk.local
@@ -14,6 +14,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :global DailyPskMatchComment;
+:global DailyPskQrCodeUrl;
 :global Identity;
 
 :global LogPrintExit2;
@@ -79,7 +80,7 @@ $WaitFullyConnected;
 
       :if ($Skip = 0) do={
         :set Seen ($Seen, $Ssid);
-        :local Link ("https://www.eworm.de/cgi-bin/cqrlogo-wifi.cgi" . \
+        :local Link ($DailyPskQrCodeUrl . \
             "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]);
         $SendNotification2 ({ origin=$0; \
           subject=([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid); \
diff --git a/daily-psk.template b/daily-psk.template
index 811f2f8..7e41a1f 100644
--- a/daily-psk.template
+++ b/daily-psk.template
@@ -15,6 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :global DailyPskMatchComment;
+:global DailyPskQrCodeUrl;
 :global Identity;
 
 :global LogPrintExit2;
@@ -87,7 +88,7 @@ $WaitFullyConnected;
 
       :if ($Skip = 0) do={
         :set Seen ($Seen, $Ssid);
-        :local Link ("https://www.eworm.de/cgi-bin/cqrlogo-wifi.cgi" . \
+        :local Link ($DailyPskQrCodeUrl . \
             "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]);
         $SendNotification2 ({ origin=$0; \
           subject=([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid); \
diff --git a/global-config b/global-config
index 1e7a185..6096f14 100644
--- a/global-config
+++ b/global-config
@@ -121,6 +121,7 @@
 # Access-list entries matching this comment are updated
 # with daily pseudo-random PSK.
 :global DailyPskMatchComment "Daily PSK";
+:global DailyPskQrCodeUrl "https://www.eworm.de/cgi-bin/cqrlogo-wifi.cgi";
 :global DailyPskSecrets {
   { "Abusive"; "Aggressive"; "Bored"; "Chemical"; "Cold";
     "Cruel"; "Curved"; "Delightful"; "Discreet"; "Elite";
diff --git a/global-config.changes b/global-config.changes
index 3db2a28..33a340e 100644
--- a/global-config.changes
+++ b/global-config.changes
@@ -100,6 +100,7 @@
   89="Made the warning time for 'check-certificates' configurable.";
   90="Chat with your router! Introduced 'telegram-chat' to chat via Telegram bot and send commands to your router.";
   91="Dropped check for CAP in 'check-routeros-update' to solve issues with wifiwave2 package.";
+  92="Made qr-code url configurable for 'daily-psk'.";
 };
 
 # Migration steps to be applied on script updates
diff --git a/global-functions b/global-functions
index 8d865ba..2f57fae 100644
--- a/global-functions
+++ b/global-functions
@@ -12,7 +12,7 @@
 :local 0 "global-functions";
 
 # expected configuration version
-:global ExpectedConfigVersion 91;
+:global ExpectedConfigVersion 92;
 
 # global variables not to be changed by user
 :global GlobalFunctionsReady false;