From b18e8042b5cc7fb367a4d417097f8d20ecf6bef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Wed, 12 Feb 2020 17:30:08 +0100
Subject: [PATCH] change configs

---
 setup-myuser.sh   | 2 ++
 setup.sh          | 1 +
 uninstall.sh      | 4 ++--
 workdirfs.conf    | 5 +++++
 workdirfs.service | 7 ++++---
 5 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 workdirfs.conf

diff --git a/setup-myuser.sh b/setup-myuser.sh
index 7576984..21d9a03 100755
--- a/setup-myuser.sh
+++ b/setup-myuser.sh
@@ -4,5 +4,7 @@ sudo cp workdirfs.py /usr/local/bin/workdirfs.py
 cp workdirfs.service ~/.config/systemd/user/workdirfs.service
 sudo mkdir -pv ~/.config/systemd/user/default.target.wants/
 sudo ln -sf ../workdirfs.service ~/.config/systemd/user/default.target.wants/workdirfs.service
+cp workdirfs.config ~/.config/workdirfs.conf
+sudo cp workdirfs.config /etc/workdirfs.conf
 systemctl --user daemon-reload
 systemctl --user restart workdirfs.service
diff --git a/setup.sh b/setup.sh
index 9c58579..66d2e01 100755
--- a/setup.sh
+++ b/setup.sh
@@ -4,5 +4,6 @@ sudo cp workdirfs.py /usr/local/bin/workdirfs.py
 sudo cp workdirfs.service /etc/systemd/user/workdirfs.service
 sudo mkdir -pv /etc/systemd/user/default.target.wants/
 sudo ln -sf ../workdirfs.service /etc/systemd/user/default.target.wants/workdirfs.service
+sudo cp workdirfs.config /etc/workdirfs.conf
 systemctl --user daemon-reload
 systemctl --user restart workdirfs.service
diff --git a/uninstall.sh b/uninstall.sh
index 88aa57e..2014ff4 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -4,6 +4,6 @@ echo "Remove workdirfs"
 echo "stop workdirfs.service"
 systemctl --user stop workdirfs.service
 echo "remove binaries and units from system"
-sudo rm -rf /usr/local/bin/workdirfs.py /etc/systemd/user/workdirfs.service /etc/systemd/user/default.target.wants/workdirfs
+sudo rm -rf /usr/local/bin/workdirfs.py /etc/workdirfs.conf /etc/systemd/user/workdirfs.service /etc/systemd/user/default.target.wants/workdirfs
 echo "remove systemd-units for this user $USER"
-rm -rf ~/.config/systemd/user/workdirfs.service ~/.config/systemd/user/default.target.wants/workdirfs.service
+rm -rf ~/.config/workdirfs.conf ~/.config/systemd/user/workdirfs.service ~/.config/systemd/user/default.target.wants/workdirfs.service
diff --git a/workdirfs.conf b/workdirfs.conf
new file mode 100644
index 0000000..777fd37
--- /dev/null
+++ b/workdirfs.conf
@@ -0,0 +1,5 @@
+ARCHIVE=${HOME}/archive
+MOUNTPOINT=${HOME}/Work
+TIMEOFFSET=2
+MONTHLYDIR=False
+YEARLYDIR=False
diff --git a/workdirfs.service b/workdirfs.service
index ddd43f4..ce58444 100644
--- a/workdirfs.service
+++ b/workdirfs.service
@@ -2,6 +2,7 @@
 Description=Daily working directory ~/Work
 
 [Service]
-Environment=WORKDIRFS_OPTIONS="-a %h/archive -m %h/Work -t 3 -M False -y False"
-ExecStart=/usr/bin/python3 -u /usr/local/bin/workdirfs.py ${WORKDIRFS_OPTIONS}
-ExecStop=/usr/bin/fusermount -u ${DST}
+EnvironmentFile=/etc/workdirfs.conf
+EnvironmentFile=-%h/.config/workdirfs.conf
+ExecStart=/usr/bin/python3 -u /usr/local/bin/workdirfs.py --archive ${ARCHIVE} --mountpoint ${MOUNTPOINT} --timeoffset ${TIMEOFFSET} --yearlydir ${YEARLYDIR} --monthlydir ${MONTHLYDIR}
+ExecStop=/usr/bin/fusermount -u ${MOUNTPOINT}