aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-09-14 14:30:25 +1200
committerTom Ryder <tom@sanctum.geek.nz>2020-09-14 14:30:25 +1200
commit709509f0d28221ff1a4e700307fb16f44f24453a (patch)
tree0370ef692d7b1cd6462cbb08258e608a91908056
parentMerge branch 'release/v10.7.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-10.8.0.tar.gz (sig)
dotfiles-10.8.0.zip
Merge branch 'release/v10.8.0'v10.8.0
* release/v10.8.0: Correct and extend 'backupskip' patterns for .git Remove forced From: header Use short `mail` options for compat with BSD mail Add timeout to Newsboat reload service Add timeout to mail notification unit Add word to timer description for clarity Add random delay to Newsboat reloading Remove hardening from systemd units
-rw-r--r--VERSION4
-rw-r--r--newsboat/systemd/user/reload-newsboat.service21
-rw-r--r--newsboat/systemd/user/reload-newsboat.timer3
-rw-r--r--systemd/user/notify-email@.service14
-rw-r--r--vim/vimrc14
5 files changed, 15 insertions, 41 deletions
diff --git a/VERSION b/VERSION
index a0eb6c25..ad615fe6 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v10.7.0
-Sat, 12 Sep 2020 05:30:54 +0000
+tejr dotfiles v10.8.0
+Mon, 14 Sep 2020 02:30:21 +0000
diff --git a/newsboat/systemd/user/reload-newsboat.service b/newsboat/systemd/user/reload-newsboat.service
index 981ef7bc..f495e67b 100644
--- a/newsboat/systemd/user/reload-newsboat.service
+++ b/newsboat/systemd/user/reload-newsboat.service
@@ -8,23 +8,4 @@ Type=oneshot
LogsDirectory=newsboat
LogsDirectoryMode=0700
ExecStart=newsboat --execute=reload --log-file=%L/newsboat/%p.log --log-level=5
-# Hardening
-IPAddressDeny=any
-IPAddressAllow=localhost
-KeyringMode=private
-LockPersonality=true
-MemoryDenyWriteExecute=true
-NoNewPrivileges=true
-RestrictAddressFamilies=AF_UNIX
-RestrictAddressFamilies=~AF_UNIX
-RestrictNamespaces=true
-RestrictRealtime=true
-SystemCallArchitectures=native
-SystemCallErrorNumber=EPERM
-SystemCallFilter=@system-service
-SystemCallFilter=~@privileged @resources
-UMask=0077
-# Slowing
-Nice=10
-IOSchedulingClass=best-effort
-IOSchedulingPriority=7
+TimeoutStartSec=5m
diff --git a/newsboat/systemd/user/reload-newsboat.timer b/newsboat/systemd/user/reload-newsboat.timer
index 6e59d66e..c3c0cb00 100644
--- a/newsboat/systemd/user/reload-newsboat.timer
+++ b/newsboat/systemd/user/reload-newsboat.timer
@@ -1,9 +1,10 @@
[Unit]
-Description=fetch new Newsboat articles
+Description=fetch new Newsboat articles schedule
[Timer]
OnBootSec=10m
OnUnitActiveSec=10m
+RandomizedDelaySec=2m
[Install]
WantedBy=timers.target
diff --git a/systemd/user/notify-email@.service b/systemd/user/notify-email@.service
index bddee12a..fba9cdaf 100644
--- a/systemd/user/notify-email@.service
+++ b/systemd/user/notify-email@.service
@@ -3,15 +3,5 @@ Description=unit status mailer service for %i
[Service]
Type=oneshot
-ExecStart=sh -c 'systemctl --user status %i | mail --append="From: systemd" --append="X-systemd: %H %m %b" --subject="[systemd] %i failure" %u'
-# Hardening
-DevicePolicy=closed
-IPAddressDeny=any
-PrivateMounts=true
-PrivateTmp=true
-ProtectControlGroups=true
-ProtectHome=true
-ProtectSystem=full
-RemoveIPC=true
-SystemCallErrorNumber=EPERM
-UMask=027
+ExecStart=sh -c 'systemctl --user status %i | mail -a "X-systemd: %H %m %b" -s "[systemd] %i failure" %u'
+TimeoutStartSec=1m
diff --git a/vim/vimrc b/vim/vimrc
index ef02a401..e9e940c2 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -2,7 +2,7 @@
" Tom Ryder (tejr)’s Literate Vimrc
" ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
"
-" Last updated: Sat, 12 Sep 2020 05:21:43 UTC
+" Last updated: Mon, 14 Sep 2020 02:28:57 UTC
"
" │ And I was lifted up in heart, and thought
" │ Of all my late-shown prowess in the lists,
@@ -273,12 +273,14 @@ if has#('unix')
set backupskip+=/usr/tmp/*,/var/tmp/*
" Per-repository temporary files for Git
- "" Commit messages
- set backupskip+=*.git/*_EDITMSG
- "" Patch edits
- set backupskip+=*.git/ADD_EDIT.patch
+ "" Commit and tag messages
+ set backupskip+=*/*.git/?*_EDITMSG
+ "" Edited patches
+ set backupskip+=*/*.git/ADD_EDIT.patch
+ "" Email messages
+ set backupskip+=*/*.git/.gitsendemail.msg.*
"" Interactive rebase manifests
- set backupskip+=*.git/rebase-merge/git-rebase-todo
+ set backupskip+=*/*.git/rebase-merge/git-rebase-todo
" systemd user manager unit files
"" Full unit files