minor fixes

diff --git a/conflink b/conflink
index d6f8ab80aed2b8c6e7aaeffd6b5e3b54c86f3b56..1a302b3fc2989c0cc8777cb628c100654f031f10 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -209,7 +209,7 @@ case $user in
     find-maybe -type d \! -name wireguard \! -path '*/moddata/*' \! -name moddata -exec chmod go+rX '{}' +
 
     find_paths=(/p/c/filesystem/etc/ssh /p/c/machine_specific/*/filesystem/etc/ssh)
-    find-maybe -type f -name '*.pub' -exec chmod go+rX '{}' +
+    find-maybe -type f \! -name '*key' -exec chmod go+rX '{}' +
     find_paths=(/p/c/machine_specific/*/filesystem/etc/apt)
     find-maybe -type f -exec chmod go+rX '{}' +
 

diff --git a/mailtest-check b/mailtest-check
index 14f7e8b3e683f774443c9fc85964e305a0a3fd1d..c08062b9081b55605661a166686f41cb47a0f2c4 100755 (executable)
--- a/mailtest-check
+++ b/mailtest-check
@@ -487,7 +487,11 @@ loop-main() {
   sleep 10
   while true; do
     premain_sec=$EPOCHSECONDS
-    maybe-toggle-ssh
+    # Disabled as the config change seems to be unreliable. I see ssh
+    # start, then listen on only 1 port even though 2 are listed in the
+    # config, I can't figure out why, then it starts working randomly.
+
+    #maybe-toggle-ssh
     main
     maini=$((maini + 1))
     sleep $(( 300 - ( EPOCHSECONDS - premain_sec ) ))