From bb607af2511b613bda78a43d8463ab24bc814720 Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Sat, 15 Apr 2017 17:57:27 -0700
Subject: [PATCH] move some paths

---
 filesystem/etc/systemd/system/iptables.service           | 4 ++--
 filesystem/etc/systemd/system/openvpn-client-nn@.service | 2 +-
 machine_specific/treetowl/filesystem/etc/cron.d/treetowl | 4 ++--
 subdir_files/.gnupg/gpg.conf                             | 6 +++++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/filesystem/etc/systemd/system/iptables.service b/filesystem/etc/systemd/system/iptables.service
index 403e076..2edf6c0 100644
--- a/filesystem/etc/systemd/system/iptables.service
+++ b/filesystem/etc/systemd/system/iptables.service
@@ -5,8 +5,8 @@ Wants=network-pre.target
 
 [Service]
 Type=oneshot
-ExecStart=/sbin/iptables-restore /a/bin/transmission-firewall/default.rules
-ExecStop=/sbin/iptables-restore /a/bin/transmission-firewall/empty.rules
+ExecStart=/sbin/iptables-restore /a/bin/distro-setup/transmission-firewall/default.rules
+ExecStop=/sbin/iptables-restore /a/bin/distro-setup/transmission-firewall/empty.rules
 RemainAfterExit=yes
 
 [Install]
diff --git a/filesystem/etc/systemd/system/openvpn-client-nn@.service b/filesystem/etc/systemd/system/openvpn-client-nn@.service
index ba89ea0..d76e194 100644
--- a/filesystem/etc/systemd/system/openvpn-client-nn@.service
+++ b/filesystem/etc/systemd/system/openvpn-client-nn@.service
@@ -23,7 +23,7 @@ LimitNPROC=10
 
 # ian: added just these  lines from upstream
 ExecStartPre=+/a/bin/newns/newns -n 10.173.0 start %i
-ExecStartPre=+/sbin/iptables-restore /a/bin/transmission-firewall/netns.rules
+ExecStartPre=+/sbin/iptables-restore /a/bin/distro-setup/transmission-firewall/netns.rules
 ExecStopPost=+/a/bin/newns/newns stop %i
 PrivateNetwork=true
 
diff --git a/machine_specific/treetowl/filesystem/etc/cron.d/treetowl b/machine_specific/treetowl/filesystem/etc/cron.d/treetowl
index b52070d..24f8c2c 100755
--- a/machine_specific/treetowl/filesystem/etc/cron.d/treetowl
+++ b/machine_specific/treetowl/filesystem/etc/cron.d/treetowl
@@ -5,9 +5,9 @@
 # runs every 10 minutes, every day 4 am, every sunday at 3 am
 # stored for 3 days, 2 months, and unlimited respectively
 SHELL=/bin/bash
-0    4 * * * ian x=$(/a/exe/logq /a/bin/small-backup --retry daily 2M); [[ $? != 0 ]] && echo "$x"
+0    4 * * * ian x=$(/usr/local/bin/logq /a/bin/small-backup/small-backup --retry daily 2M); [[ $? != 0 ]] && echo "$x"
 0    3 * * sun ian echo weekly backup results:; /a/bin/small-backup --retry weekly -batch -prefer ~/.mpv -silent 2>&1 | /usr/local/bin/log-once unison-mpv
 */5  * * * *   ian /a/bin/distro-setup/dynamic-ip-update.sh 2>&1 | /usr/local/bin/log-once -15
-*/10 * * * *   ian /a/bin/small-backup 10minutes 3D 2>&1 | /usr/local/bin/log-once small-backup-10min
+*/10 * * * *   ian /a/exe/small-backup 10minutes 3D 2>&1 | /usr/local/bin/log-once small-backup-10min
 # put things we don't want to send mail about below this:
 # MAILTO=""
diff --git a/subdir_files/.gnupg/gpg.conf b/subdir_files/.gnupg/gpg.conf
index 4a977eb..189bf93 100644
--- a/subdir_files/.gnupg/gpg.conf
+++ b/subdir_files/.gnupg/gpg.conf
@@ -9,4 +9,8 @@ use-agent
 # standard short key ids are easy to collide
 # https://security.stackexchange.com/questions/84280/short-openpgp-key-ids-are-insecure-how-to-configure-gnupg-to-use-long-key-ids-i
 # https://evil32.com/
-keyid-format 0xlong
+#keyid-format 0xlong
+
+# however, not using for now, since I just want to
+# identify the keys i have, not remote keys.
+keyid-format 0xshort
-- 
2.30.2