From c2c6421d3f8db9920fe50f07eff226641586f87a Mon Sep 17 00:00:00 2001 From: Timo Wilken Date: Thu, 4 Jul 2024 19:52:32 +0200 Subject: Fix system package installation on lud Previously, this led to e.g. coreutils not being installed system-wide. Switch to not specifying the `operating-system-packages' field at all and just use `profile-service-type'. This also lets me move Nextcloud-specific packages into the appropriate service module. --- tw/services/nextcloud.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tw/services/nextcloud.scm') diff --git a/tw/services/nextcloud.scm b/tw/services/nextcloud.scm index 4347b100..177af535 100644 --- a/tw/services/nextcloud.scm +++ b/tw/services/nextcloud.scm @@ -3,16 +3,20 @@ #:use-module (gnu) #:use-module (gnu packages backup) #:use-module (gnu packages certs) + #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages linux) #:use-module (gnu packages php) + #:use-module (gnu packages tls) #:use-module (gnu packages web) + #:use-module (gnu services) #:use-module (gnu services certbot) #:use-module (gnu services mcron) #:use-module (gnu services web) #:use-module (guix gexp) #:use-module ((guix packages) #:select (package-version)) #:use-module ((guix utils) #:select (version-major)) + #:use-module (tw packages php) #:use-module (tw services restic) #:use-module (tw services web)) @@ -282,6 +286,12 @@ opcache.revalidate_freq=120 ("PATH" . "/run/setuid-programs:/run/current-system/profile/bin:/run/current-system/profile/sbin"))) (php-ini-file %nextcloud-php.ini))) + (simple-service 'nextcloud-packages profile-service-type + (list + ;; PHP modules must be installed in system profile, as that's + ;; referred to in Nextcloud's php.ini. + php php-apcu php-imagick openssl curl)) + (simple-service 'nextcloud-certificates certbot-service-type (list (certificate-configuration (domains (list nextcloud-domain)) -- cgit v1.2.3