aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2020-05-27 00:21:30 +0200
committerGravatar Christian Hesse <mail@eworm.de>2020-05-27 00:21:30 +0200
commit75979116727eed330b404dfb9c01354704193fc9 (patch)
tree3865c467e3ccb253328017f4407ee5af12caf653
parent7ecda2204fa5ee69996ab579c89bdf87e175686c (diff)
daily-psk: wait to be fully connected
-rw-r--r--daily-psk.capsman4
-rw-r--r--daily-psk.local4
-rw-r--r--daily-psk.template4
-rw-r--r--doc/daily-psk.md2
4 files changed, 10 insertions, 4 deletions
diff --git a/daily-psk.capsman b/daily-psk.capsman
index 623ef0c..a457454 100644
--- a/daily-psk.capsman
+++ b/daily-psk.capsman
@@ -15,8 +15,9 @@
:global SendNotification;
:global UrlEncode;
:global WaitForFile;
+:global WaitFullyConnected;
-:local Seen [ :toarray "" ];
+$WaitFullyConnected;
# return pseudo-random string for PSK
:local GeneratePSK do={
@@ -48,6 +49,7 @@
($DailyPskSecrets->2->$WeekDay));
}
+:local Seen [ :toarray "" ];
:local Date [ / system clock get date ];
:local NewPsk [ $GeneratePSK $Date ];
diff --git a/daily-psk.local b/daily-psk.local
index 6245ebe..d4d6a72 100644
--- a/daily-psk.local
+++ b/daily-psk.local
@@ -15,8 +15,9 @@
:global SendNotification;
:global UrlEncode;
:global WaitForFile;
+:global WaitFullyConnected;
-:local Seen [ :toarray "" ];
+$WaitFullyConnected;
# return pseudo-random string for PSK
:local GeneratePSK do={
@@ -48,6 +49,7 @@
($DailyPskSecrets->2->$WeekDay));
}
+:local Seen [ :toarray "" ];
:local Date [ / system clock get date ];
:local NewPsk [ $GeneratePSK $Date ];
diff --git a/daily-psk.template b/daily-psk.template
index 3181b1a..e9f061f 100644
--- a/daily-psk.template
+++ b/daily-psk.template
@@ -16,8 +16,9 @@
:global SendNotification;
:global UrlEncode;
:global WaitForFile;
+:global WaitFullyConnected;
-:local Seen [ :toarray "" ];
+$WaitFullyConnected;
# return pseudo-random string for PSK
:local GeneratePSK do={
@@ -49,6 +50,7 @@
($DailyPskSecrets->2->$WeekDay));
}
+:local Seen [ :toarray "" ];
:local Date [ / system clock get date ];
:local NewPsk [ $GeneratePSK $Date ];
diff --git a/doc/daily-psk.md b/doc/daily-psk.md
index 26ab3d1..c6055d6 100644
--- a/doc/daily-psk.md
+++ b/doc/daily-psk.md
@@ -28,7 +28,7 @@ For local interface:
And add schedulers to run the script:
/ system scheduler add interval=1d name=daily-psk-nightly on-event="/ system script run daily-psk.local;" start-date=may/23/2018 start-time=03:00:00;
- / system scheduler add name=daily-psk-startup on-event=":global WaitFullyConnected; / system script { run global-wait; \$WaitFullyConnected; run daily-psk.local; }" start-time=startup;
+ / system scheduler add name=daily-psk-startup on-event="/ system script { run global-wait; run daily-psk.local; }" start-time=startup;
These will update the passphrase on boot and nightly at 3:00.