iankelling.org
/
git
/
distro-setup
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c1380ec
)
move some paths
author
Ian Kelling
<ian@iankelling.org>
Sun, 16 Apr 2017 00:57:27 +0000
(17:57 -0700)
committer
Ian Kelling
<ian@iankelling.org>
Sun, 16 Apr 2017 00:57:27 +0000
(17:57 -0700)
filesystem/etc/systemd/system/iptables.service
patch
|
blob
|
history
filesystem/etc/systemd/system/openvpn-client-nn@.service
patch
|
blob
|
history
machine_specific/treetowl/filesystem/etc/cron.d/treetowl
patch
|
blob
|
history
subdir_files/.gnupg/gpg.conf
patch
|
blob
|
history
diff --git
a/filesystem/etc/systemd/system/iptables.service
b/filesystem/etc/systemd/system/iptables.service
index 403e076e802637831ead35646e881002878124c9..2edf6c0ea6f7c24422b94b4230a1f59f7d7c963b 100644
(file)
--- 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
[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]
RemainAfterExit=yes
[Install]
diff --git
a/filesystem/etc/systemd/system/openvpn-client-nn@.service
b/filesystem/etc/systemd/system/openvpn-client-nn@.service
index ba89ea020a15ce432b491192bfad55a5db997310..d76e194929415ab2d3065a061468912f77604d3a 100644
(file)
--- 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
# 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
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 b52070de8eeeb84f0167e93fe8e83c8fd2ba6660..24f8c2cad00d7ac2e9a2125cd8903555fdc5cdb5 100755
(executable)
--- 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
# 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
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=""
# 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 4a977eb5ed57783fc323e061b2d4d7db5de6f475..189bf936308e197e8e9a69339145ceccb482f162 100644
(file)
--- 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/
# 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