add rss2email, lump ff unstable upgrades with the rest

diff --git a/distro-begin b/distro-begin
index 78c92eb74eaf15b4c57a8baa7ec078a5631de893..71e2a56d80c7e26bda12ee316b7b433061730d97 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -310,6 +310,11 @@ case $(distro-name) in
                 # I switch to using firefox-esr. note: They seem
                 # to release a new esr version every 9 months or so.
                 pi firefox/unstable
+                s dd of=/etc/apt/preferences.d/firefox <<'EOF'
+Package: firefox
+Pin: release a=unstable
+Pin-Priority: 500
+EOF
             fi
         fi
         # for hosts which require nonfree drivers

diff --git a/distro-end b/distro-end
index 7cac9a6abfd82e3d04062bffed426f7b1006590b..eac2a642ba2a0eec11c426c04d6f412a873b9063 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -535,7 +535,35 @@ esac
 
 ########### end section including li/lj ###############
 
-# pump.io periodic backup
+if [[ $HOSTNAME == treetowl ]]; then
+    # note, see bashrc for more documentation.
+    pi rss2email
+    s dd of=/etc/systemd/system/rss2email.service <<'EOF'
+[Unit]
+Description=rss2email
+After=multi-user.target
+
+[Service]
+User=ian
+Type=oneshot
+# about 24 hours of failures
+ExecStart=/a/bin/log-quiet/sysd-mail-once -288 rss2email r2e run
+EOF
+    s dd of=/etc/systemd/system/rss2email.timer <<'EOF'
+[Unit]
+Description=rss2email
+
+[Timer]
+OnUnitInactiveSec=300
+
+[Install]
+WantedBy=timers.target
+EOF
+    s systemctl daemon-reload
+    sgo rss2email.timer
+fi
+
+######### begin  pump.io periodic backup #############
 if [[ $HOSTNAME == treetowl ]]; then
     s dd of=/etc/systemd/system/pumpbackup.service <<'EOF'
 [Unit]
@@ -547,7 +575,6 @@ User=ian
 Type=oneshot
 ExecStart=/a/bin/log-quiet/sysd-mail-once pump-backup /a/bin/distro-setup/pump-backup
 EOF
-
     s dd of=/etc/systemd/system/pumpbackup.timer <<'EOF'
 [Unit]
 Description=pump li backup hourly
@@ -561,6 +588,7 @@ EOF
     s systemctl daemon-reload
     sgo pumpbackup.timer
 fi
+#########  end  pump.io periodic backup #############
 
 case $distro in
     debian|ubuntu)
@@ -601,6 +629,8 @@ spa lib32stdc++6 default-jdk
 
 
 if [[ $HOSTNAME == treetowl ]]; then
+    ############# begin syncthing setup ###########
+
     # It\'s simpler to just worry about running it in one place for now.
     # I assume it would work to clone it\'s config to another non-phone
     # and just run it in one place instead of the normal having a
@@ -669,6 +699,8 @@ if [[ $HOSTNAME == treetowl ]]; then
     #
     # Note, the other thing i did was port forward port 22000,
     # per https://docs.syncthing.net/users/firewall.html
+
+    #############  end syncthing setup ###########
 fi