From a07018b80253b3f42ba1b7eba598526a5a2e078b Mon Sep 17 00:00:00 2001
From: Chris <stofflees@gmail.com>
Date: Sun, 26 Mar 2023 11:08:10 +0100
Subject: [PATCH] Fix services

---
 bootstrap.sh                     |  3 +++
 certbot/certbot.service          |  2 +-
 docker-compose.yml               |  1 -
 nextcloud/nextcloud-scan.service |  6 ++++++
 nextcloud/nextcloud-scan.timer   | 10 ++++++++++
 5 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 nextcloud/nextcloud-scan.service
 create mode 100644 nextcloud/nextcloud-scan.timer

diff --git a/bootstrap.sh b/bootstrap.sh
index d66c52d..98aad45 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -73,6 +73,9 @@ chown -R git /var/lib/gitea
 #    systemctl enable --now certbot.timer
 #fi
 
+cp /opt/scarif/zfs/* /etc/systemd/system/
+systemctl enable --now zfs-scrub.timer
+
 echo "------- Adding config folders for jitsi -------"
 mkdir -p /opt/jitsi/{web/letsencrypt,transcripts,prosody/config,prosody/prosody-plugins-custom,jicofo,jvb,jigasi,jibri}
 
diff --git a/certbot/certbot.service b/certbot/certbot.service
index 111b995..87a5d54 100644
--- a/certbot/certbot.service
+++ b/certbot/certbot.service
@@ -3,4 +3,4 @@ Description=Let's Encrypt renewal
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/certbot renew --quiet --agree-tos --deploy-hook "cp /etc/letsencrypt/live/scarif.space/fullchain.pem /opt/ssl/scarif.space.crt && cp /etc/letsencrypt/live/scarif.space/privkey.pem /opt/ssl/scarif.space.key && docker-compose /opt/scarif/docker-compose.yml exec nginx nginx -s reload"
+ExecStart=/usr/bin/certbot renew --quiet --agree-tos --deploy-hook "cp /etc/letsencrypt/live/scarif.space-001/fullchain.pem /opt/ssl/scarif.space.crt && cp /etc/letsencrypt/live/scarif.space-001/privkey.pem /opt/ssl/scarif.space.key && docker-compose -f /opt/scarif/docker-compose.yml exec nginx nginx -s reload"
diff --git a/docker-compose.yml b/docker-compose.yml
index be898d3..2419029 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -511,7 +511,6 @@ services:
       - gitea
       - collabora
     ports:
-      - 80:80
       - 443:443
     networks:
       - nginx
diff --git a/nextcloud/nextcloud-scan.service b/nextcloud/nextcloud-scan.service
new file mode 100644
index 0000000..c86fce1
--- /dev/null
+++ b/nextcloud/nextcloud-scan.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Nextcloud file scan
+
+[Service]
+Type=oneshot
+ExecStart=docker-compose -f /opt/scarif/docker-compose.yml exec nextcloud php occ files:scan --all
diff --git a/nextcloud/nextcloud-scan.timer b/nextcloud/nextcloud-scan.timer
new file mode 100644
index 0000000..bbf2c46
--- /dev/null
+++ b/nextcloud/nextcloud-scan.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Regular scan of nextcloud files
+
+[Timer]
+OnCalendar=*:0/15
+RandomizedDelaySec=2m
+Persistent=true
+
+[Install]
+WantedBy=timers.target