From f386dd2d1809cc74a41cd35f773d99d7bc95b6ac Mon Sep 17 00:00:00 2001
From: Actaeus Curabitur <actcur@actcur.com>
Date: Sun, 16 Feb 2020 23:10:43 +0000
Subject: [PATCH] Set up autorestart for transmission and fixed pkg-cache to
 allow zst files

---
 states/roles/maintain/pkg-cache/pkg-cache.conf   |  2 +-
 states/roles/maintain/transmission/init.sls      | 13 ++++++++-----
 states/roles/maintain/transmission/resolv.conf   |  3 +++
 .../transmission/restart_transmission.sh         | 16 ++--------------
 4 files changed, 14 insertions(+), 20 deletions(-)
 create mode 100644 states/roles/maintain/transmission/resolv.conf

diff --git a/states/roles/maintain/pkg-cache/pkg-cache.conf b/states/roles/maintain/pkg-cache/pkg-cache.conf
index 311ff10..680b5fc 100644
--- a/states/roles/maintain/pkg-cache/pkg-cache.conf
+++ b/states/roles/maintain/pkg-cache/pkg-cache.conf
@@ -24,7 +24,7 @@ server
 
 	# Requests for actual packages should be served directly from cache if available.
 	#   If not available, retrieve and save the package from an upstream mirror.
-	location ~ \.tar\.xz$ {
+	location ~ \.tar\.(xz|zst)$ {
 		try_files $uri @pkg_mirror;
 	}
 
diff --git a/states/roles/maintain/transmission/init.sls b/states/roles/maintain/transmission/init.sls
index 92f411e..4090485 100644
--- a/states/roles/maintain/transmission/init.sls
+++ b/states/roles/maintain/transmission/init.sls
@@ -8,11 +8,6 @@ transmission-settings:
     - target: /mnt/video/transmission/settings.json
     - force: true
 
-transmission-service:
-  service.running:
-    - name: transmission
-    - enable: true
-
 /opt/scripts/restart_transmission.sh:
   file.managed:
     - source: salt://roles/maintain/transmission/restart_transmission.sh
@@ -21,6 +16,14 @@ transmission-service:
     - mode: 644
     - mkdirs: true
 
+/opt/resolv.conf:
+  file.managed:
+    - source: salt://roles/maintain/transmission/resolv.conf
+    - user: root
+    - group: root
+    - mode: 644
+    - mkdirs: true
+
 /etc/systemd/system/restart_transmission.service:
   file.managed:
     - source: salt://roles/maintain/transmission/restart_transmission.service
diff --git a/states/roles/maintain/transmission/resolv.conf b/states/roles/maintain/transmission/resolv.conf
new file mode 100644
index 0000000..8387214
--- /dev/null
+++ b/states/roles/maintain/transmission/resolv.conf
@@ -0,0 +1,3 @@
+# Generated by resolvconf
+domain eau.wi.charter.com
+nameserver 172.16.40.20
diff --git a/states/roles/maintain/transmission/restart_transmission.sh b/states/roles/maintain/transmission/restart_transmission.sh
index 5f84013..9e9275e 100644
--- a/states/roles/maintain/transmission/restart_transmission.sh
+++ b/states/roles/maintain/transmission/restart_transmission.sh
@@ -3,19 +3,7 @@
 hour=`date | grep -Po "\d\d:\d\d:\d\d" | grep -Po "^\d\d:\d\d"`
 
 if [ "$hour" = "00:00" ] || [ "$hour" = "06:00" ] || [ "$hour" = "12:00" ] || [ "$hour" = "18:00" ];then
-  windscribe disconnect
-  windscribe connect
-  systemctl restart transmission.service
-fi
-
-currentip=`ps aux | grep rtorrent | grep -v "SCREEN" | grep -Po "\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}"`
-tunip=`ip addr show tun0 | grep -Po "inet \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" | grep -Po "\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}"`
-
-if [ "$currentip" = "$tunip" ];then
-  echo "transmission is up"
-else
-  echo "restarting transmission"
-  windscribe disconnect
-  windscribe connect
+  systemctl restart windscribe.service
+  cp /opt/resolv.conf /etc/resolv.conf
   systemctl restart transmission.service
 fi