add nextcloud cron job, fix spacing and forward XFF

modules/nextcloud/files/Caddyfile.tftpl

@@ -85,7 +85,8 @@ ${nextcloud_domain}:443 {
       dial_timeout 60s
       read_timeout 3600s
       write_timeout 300s
-		}
+      header_up X-Forwarded-For {header.X-Forwarded-For} # Keep header from previous "general" reverse proxy
+      header_up X-Real-IP {remote_host}
     }
 
   header Strict-Transport-Security "max-age=15768000;"

modules/nextcloud/files/nextcloud-cronjob.service.tftpl

@@ -0,0 +1,7 @@
+[Unit]
+Description=Nextcloud cron.php job
+
+[Service]
+ExecCondition=/usr/bin/podman exec -ti -u www-data ${nextcloud_container_name} /usr/local/bin/php -f /var/www/html/occ status -ev
+ExecStart=/usr/bin/podman exec -ti -u www-data ${nextcloud_container_name} /usr/local/bin/php -f /var/www/html/cron.php
+KillMode=process

modules/nextcloud/files/nextcloud-cronjob.timer

@@ -0,0 +1,9 @@
+[Unit]
+Description=Run Nextcloud cron.php every 5 minutes
+
+[Timer]
+OnBootSec=5min
+OnUnitActiveSec=5min
+
+[Install]
+WantedBy=timers.target

modules/nextcloud/main.tf

@@ -192,8 +192,8 @@ locals {
 
   hostname_file = {
     path  = "/etc/hostname"
-    user = {id = 0}
-    group = {id = 0}
+    user  = { id = 0 }
+    group = { id = 0 }
     mode  = 420 # 0644
     contents = {
       source = "data:text/plain,nextcloud"
@@ -202,8 +202,8 @@ locals {
 
   hosts_file = {
     path  = "/etc/hosts"
-    user = {id = 0}
-    group = {id = 0}
+    user  = { id = 0 }
+    group = { id = 0 }
     mode  = 420 # 0644
     append = [
       {
@@ -518,8 +518,8 @@ locals {
 
   php_fpm_config_file = {
     path  = "/opt/php/www.conf"
-    user = {id = 0}
-    group = {id = 0}
+    user  = { id = 0 }
+    group = { id = 0 }
     mode  = 420 # 0644
     contents = {
       source = format(
@@ -542,6 +542,22 @@ locals {
     )
   }
 
+  nextcloud_cronjob_service_unit = {
+    name = "nextcloud-cronjob.service"
+    contents = templatefile(
+      "${path.module}/files/nextcloud-cronjob.service.tftpl",
+      {
+        nextcloud_container_name = local.nextcloud_container_name
+      }
+    )
+  }
+
+  nextcloud_cronjob_timer_unit = {
+    name     = "nextcloud-cronjob.timer"
+    enabled  = true
+    contents = file("${path.module}/files/nextcloud-cronjob.timer")
+  }
+
   ignition_config = {
     ignition = {
       version = "3.5.0"
@@ -589,6 +605,8 @@ locals {
     systemd = {
       units = [
         local.generate_secrets_systemd_unit,
+        local.nextcloud_cronjob_service_unit,
+        local.nextcloud_cronjob_timer_unit,
       ]
     }
     passwd = {