From cd3c156f93ecc64c755bd96ccc7009c2aade393f Mon Sep 17 00:00:00 2001
From: KemoNine <kemonine@kemonine.info>
Date: Mon, 3 Aug 2020 17:11:14 +0000
Subject: [PATCH] Misc cleanup of commands run based on additional tests

---
 docs/cockpit.md    |  2 +-
 docs/networking.md |  1 +
 docs/restic.md     |  6 +++---
 docs/slideshow.md  | 10 ++++------
 docs/syncthing.md  |  2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/docs/cockpit.md b/docs/cockpit.md
index 441c88e..5a6ede2 100644
--- a/docs/cockpit.md
+++ b/docs/cockpit.md
@@ -5,7 +5,7 @@ The below commands will setup ```cockpit``` so you can manage your PiFrame from
 ``` sh
 
 # Remote management on http://ip:9090
-apt install cockpit
+apt install cockpit exfat-utils udisks2-btrfs 
 firewall-cmd --zone=public --permanent --add-port=9090/tcp
 firewall-cmd --reload
 systemctl enable --now cockpit.socket
diff --git a/docs/networking.md b/docs/networking.md
index f149db7..7bf322d 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -20,6 +20,7 @@ systemctl disable ufw
 firewall-cmd --zone=public --permanent --add-service=ssh
 firewall-cmd --reload
 systemctl enable --now NetworkManager
+systemctl restart NetworkManager
 systemctl enable --now firewalld
 
 # Setup Ethernet
diff --git a/docs/restic.md b/docs/restic.md
index 2f25ff6..6682d0a 100644
--- a/docs/restic.md
+++ b/docs/restic.md
@@ -32,7 +32,7 @@ ZONE=root
 export RESTIC_REPOSITORY=/tank/backup/
 export RESTIC_PASSWORD=testing1234
 
-/usr/bin/restic backup -v -q \
+/usr/local/bin/restic backup -v -q \
     --tag $MACHINE --tag $ZONE \
     / \
     --exclude /run \
@@ -47,7 +47,7 @@ export RESTIC_PASSWORD=testing1234
     --exclude /mnt \
     --exclude /root/.cache \
 
-/usr/bin/restic forget -v \
+/usr/local/bin/restic forget -v \
     --tag $MACHINE --tag $ZONE \
     --keep-daily=7 \
     --keep-weekly=4 \
@@ -55,7 +55,7 @@ export RESTIC_PASSWORD=testing1234
     --keep-yearly 1
 
 # This can take a very, very long time
-/usr/bin/restic prune && /usr/bin/restic check
+/usr/local/bin/restic prune && /usr/local/bin/restic check
 EOF
 chmod a+x /root/restic_backup.sh
 crontab -e
diff --git a/docs/slideshow.md b/docs/slideshow.md
index 556eb9a..4d579c9 100644
--- a/docs/slideshow.md
+++ b/docs/slideshow.md
@@ -14,10 +14,8 @@ The below commands will setup ```fim``` as a slideshow on your display.
 
 useradd -m -G video -s /usr/sbin/nologin fim
 apt install acl
-setfacl -m
-unbind "u:fim:rX" /tank/pictures
-setfacl -dm
-unbind "u:fim:rX" /tank/pictures
+setfacl -m "u:fim:rX" /tank/pictures
+setfacl -dm "u:fim:rX" /tank/pictures
 apt install fim imagemagick ttf-dejavu
 cat > /home/fim/.fimrc <<EOF
 # Tweak left of status bar to show filename and taken date/time only
@@ -214,7 +212,7 @@ apt install incron
 cat > /etc/incron.d/fim <<EOF
 /tank/pictures IN_DELETE systemctl restart fim
 EOF
-systemctl enable --now incrond
-systemctl restart incrond
+systemctl enable --now incron
+systemctl restart incron
 
 ```
diff --git a/docs/syncthing.md b/docs/syncthing.md
index 25656fa..c7e3176 100644
--- a/docs/syncthing.md
+++ b/docs/syncthing.md
@@ -6,7 +6,7 @@ The below will setup ```syncthing``` and give some basics for setup. This is who
 
 curl -s https://syncthing.net/release-key.txt | sudo apt-key add -
 echo "deb https://apt.syncthing.net/ syncthing stable" | sudo tee /etc/apt/sources.list.d/syncthing.list
-apt update & apt install syncthing
+apt update && apt install syncthing
 touch /tank/pictures/.stfolder
 chown fim: /tank/pictures/.stfolder
 systemctl enable --now syncthing@fim.service # use feh user so perms are right for pics