From db4bdfe516b6daf3c4d0d2c621d42b73565b12bf Mon Sep 17 00:00:00 2001 From: Timo Wilken Date: Sun, 21 May 2023 15:35:04 +0200 Subject: Extract Nextcloud cron command into script --- tw/services/nextcloud.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'tw/services/nextcloud.scm') diff --git a/tw/services/nextcloud.scm b/tw/services/nextcloud.scm index 65b73f95..1fa71e8e 100644 --- a/tw/services/nextcloud.scm +++ b/tw/services/nextcloud.scm @@ -103,19 +103,17 @@ Header always set Strict-Transport-Security \"max-age=15552000\" ;; Nextcloud cron (simple-service 'nextcloud-cron mcron-service-type (list #~(job "*/5 * * * *" - (lambda () - ;; Nextcloud News needs this to fetch HTTPS feeds. - (setenv "SSL_CERT_DIR" #$(file-append nss-certs "/etc/ssl/certs")) - (chdir "/var/www/nextcloud") - ;; `setgid' first while we're still root - (setgid (group:gid (getgr "httpd"))) - (setuid (passwd:uid (getpw "httpd"))) - (execl #$(file-append php "/bin/php") "php" - "-c" #$%nextcloud-php.ini "cron.php")) - (string-append - #$(file-append php "/bin/php") - " -c " #$%nextcloud-php.ini - " /var/www/nextcloud/cron.php")) + #$(program-file + "nextcloud-cron-command" + #~(begin + ;; `setgid' first while we're still root + (setgid (group:gid (getgr "httpd"))) + (setuid (passwd:uid (getpw "httpd"))) + (chdir "/var/www/nextcloud") + ;; Nextcloud News needs this to fetch HTTPS feeds. + (setenv "SSL_CERT_DIR" #$(file-append nss-certs "/etc/ssl/certs")) + (execl #$(file-append php "/bin/php") "php" + "-c" #$%nextcloud-php.ini "cron.php")))) ;; Nextcloud backups ;; Requires: sudo, php, btrfs, mysqldump, rsync -- cgit v1.2.3