various improvements

diff --git a/brc b/brc
index b8eb1201c21155043f505feb03a9350ebc37dcbf..e1aa677c23ab4c4fe32a64ae7dd30c659d864e7d 100644 (file)
--- a/brc
+++ b/brc
@@ -1840,7 +1840,7 @@ testsieve() {
   _dosieve ~/sieve/maintest.sieve ${1:-INBOX} delete
 }
 runsieve() {
-  c ~/sieve; cp personal{test,}.sieve; cp lists{test,}.sieve
+  c ~/sieve; cp personal{test,}.sieve; cp lists{test,}.sieve; cp personalend{test,}.sieve
   _dosieve ~/sieve/main.sieve -eW ${1:-INBOX} delete
 }
 

diff --git a/distro-end b/distro-end
index 91ae7e3ef0ceae5965fa2e48a2ecbfc39487923b..84566b89fa4299468c147d69bd2e60ee97911166 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -193,11 +193,6 @@ s dpkg-reconfigure -u -fnoninteractive unattended-upgrades
 # Setup daily reboots, so all unattended upgrades go into affect
 # unattended upgrades happen at 6 am + rand(60 min).
 echo '20 7 * * * root /usr/local/bin/zelous-unattended-reboot' | s dd of=/etc/cron.d/unattended-upgrade-reboot
-case $(debian-codename) in
-  flidas)
-    if [[ ! -e /usr/local/bin/checkrestart ]]; then
-      ;;
-esac
 ##### end automatic upgrades ####
 
 # office is not exposed to internet yet
@@ -1737,9 +1732,12 @@ if ! type -p guix >/dev/null; then
   guix package --install guile
 fi
 
-# install rust
+# install rust.
 curl https://sh.rustup.rs -sSf | bash -s -- -y
-cargo install ripgrep
+# todo: update this. updates in rust are stupidly complicate
+if ! which rg &>/dev/null; then
+  cargo install ripgrep
+fi
 
 #### tor
 case $distro in

diff --git a/machine_specific/li/filesystem/etc/bind/named.conf.local b/machine_specific/li/filesystem/etc/bind/named.conf.local
index 5253a12e061a5e9b7790fd8643da240c17cb7c67..39df3fa2ee6c6bc6a8f36e6c57827250b362c03f 100644 (file)
--- a/machine_specific/li/filesystem/etc/bind/named.conf.local
+++ b/machine_specific/li/filesystem/etc/bind/named.conf.local
@@ -18,3 +18,13 @@ file "/var/lib/bind/db.b8.nz";
   };
 };
 include "/etc/bind/key.b8.nz";
+
+zone "iankelling.org" {
+type master;
+file "/var/lib/bind/db.iankelling.org";
+};
+
+zone "zroe.org" {
+type master;
+file "/var/lib/bind/db.zroe.org";
+};

diff --git a/mail-notes.conf b/mail-notes.conf
index 65b4f5470b8d65f9ee9270b2a0a46f9847740968..d20c3439533a230ee6e6ceede16ce35890bb00aa 100644 (file)
--- a/mail-notes.conf
+++ b/mail-notes.conf
@@ -21,7 +21,7 @@
 # This is a Debian specific file
 
 
-# Its not easy to looku
+# Its not easy to lookup these strings, I dunno how.
 
 
 # Mail Server configuration

diff --git a/my-update-info-dir b/my-update-info-dir
new file mode 100755 (executable)
index 0000000..92235ea
--- /dev/null
+++ b/my-update-info-dir
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+
+INFODIR=/usr/share/info
+sudo rm -f "$INFODIR/dir"
+
+for dir in $(emacs --batch --eval '(progn(package-initialize) (dolist (x Info-directory-list) (message x)))' |& sort -u); do
+
+  case ${dir%/} in
+    # this is from /usr/sbin/update-info-dir
+    */info)
+
+      echo $dir
+      find $dir -type f | while read file ; do
+        case $file in
+          */dir|*/dir.gz|*/dir.old|*/dir.old.gz|*-[0-9]|*-[0-9].gz|*-[1-9][0-9]|*-[1-9][0-9].gz|*.png|*.jpg)
+            # these files are ignored
+            continue
+            ;;
+          *)
+            echo $file
+            sudo install-info "$file" "$INFODIR/dir"
+            ;;
+        esac
+      done
+      ;;
+    # ignore relative
+    [^/]*) : ;;
+    *)
+      for file in $dir/*.info*; do
+        #echo $file
+        sudo install-info "$file" "$INFODIR/dir"
+      done
+      ;;
+  esac
+done

diff --git a/subdir_files/sieve/lists.sieve b/subdir_files/sieve/lists.sieve
index d17fb1e044a1597171dd277b0fd0ab3be8399990..3211ffba123ca2582652af56b08f7813d67a2bf7 100644 (file)
--- a/subdir_files/sieve/lists.sieve
+++ b/subdir_files/sieve/lists.sieve
@@ -73,6 +73,7 @@ if anyof (
     if header :regex "list-id" "<([a-z_0-9-]+)[.@]" {
         set :lower "listname" "${1}";
         fileinto :create "l/${listname}";
+            stop;
         }
          }
 if anyof (
@@ -82,6 +83,7 @@ if anyof (
     if header :regex "list-id" "<([a-z_0-9-]+)[.@]" {
         set :lower "listname" "${1}";
         fileinto :create "l/fedora.${listname}";
+            stop;
         }
          }
 

diff --git a/subdir_files/sieve/liststest.sieve b/subdir_files/sieve/liststest.sieve
index d17fb1e044a1597171dd277b0fd0ab3be8399990..3211ffba123ca2582652af56b08f7813d67a2bf7 100644 (file)
--- a/subdir_files/sieve/liststest.sieve
+++ b/subdir_files/sieve/liststest.sieve
@@ -73,6 +73,7 @@ if anyof (
     if header :regex "list-id" "<([a-z_0-9-]+)[.@]" {
         set :lower "listname" "${1}";
         fileinto :create "l/${listname}";
+            stop;
         }
          }
 if anyof (
@@ -82,6 +83,7 @@ if anyof (
     if header :regex "list-id" "<([a-z_0-9-]+)[.@]" {
         set :lower "listname" "${1}";
         fileinto :create "l/fedora.${listname}";
+            stop;
         }
          }
 

diff --git a/subdir_files/sieve/main.sieve b/subdir_files/sieve/main.sieve
index 1098ea031af843991058f4b18e530340ba3cfee5..8b9920e1e19fe34d76b87ef1958690db62b5cba8 100644 (file)
--- a/subdir_files/sieve/main.sieve
+++ b/subdir_files/sieve/main.sieve
@@ -15,6 +15,7 @@ if header :regex "x-spam_bar" "^\\+{5}" {
 
 include :personal "personal";
 include :personal "lists";
+include :personal "personalend";
 
 
 # note, i originally used something like this to filter mailing lists

diff --git a/subdir_files/sieve/maintest.sieve b/subdir_files/sieve/maintest.sieve
index d7e749bdd2205e88f8a32fe2c1e82f8c2323d138..fefbd71ccef6a9291971be95934dc9a4a3cc72b0 100644 (file)
--- a/subdir_files/sieve/maintest.sieve
+++ b/subdir_files/sieve/maintest.sieve
@@ -15,6 +15,7 @@ if header :regex "x-spam_bar" "^\\+{5}" {
 
 include :personal "personaltest";
 include :personal "liststest";
+include :personal "personalendtest";
 
 
 # note, i originally used something like this to filter mailing lists