bunch of fixes, change sy host, deploy some new stuff

[distro-setup] / primary-setup

diff --git a/primary-setup b/primary-setup
index 61c4c326585074f319eda377b356a40248c7c925..26ce7447dc03652040e84801f45e3314d39b6c12 100755 (executable)
--- a/primary-setup
+++ b/primary-setup
@@ -27,16 +27,14 @@ if dpkg -s rss2email &>/dev/null; then
   if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
     # arbtt disabled for now
     #DISPLAY=:0 arbtt-capture --sample-rate=10 &
-    m systemctl start rss2email.timer
-    m systemctl enable rss2email.timer
+    m systemctl --now enable rss2email.timer
     # off is in mail-setup. no reason for this to be in the rss2email block.
-    m systemctl start btrbk.timer
-    m systemctl enable btrbk.timer
-
+    m systemctl --now enable btrbk.timer
   else
-    m systemctl stop rss2email.timer
+    m systemctl --now disable btrbk.timer
+
     m systemctl stop rss2email.service
-    m systemctl disable rss2email.timer
+    m systemctl --now disable rss2email.timer
     # arbtt disabled for now
     # for ((i=0; i<10; i++)); do
     #   killall arbtt-capture || break