Addressed some things nixd complained about
This commit is contained in:
alejandro-angulo 2024-08-03 10:32:02 -07:00
parent 7d8c009c64
commit b9b996bd66
Signed by: alejandro-angulo
GPG key ID: 75579581C74554B6
25 changed files with 145 additions and 187 deletions

View file

@ -3,14 +3,13 @@
lib,
pkgs,
...
}:
with lib; let
}: let
cfg = config.aa.services.nextcloud;
in {
options.aa.services.nextcloud = with types; {
options.aa.services.nextcloud = with lib; {
enable = mkEnableOption "nextcloud";
acmeCertName = mkOption {
type = str;
type = types.str;
default = "";
description = ''
If set to a non-empty string, forces SSL with the supplied acme
@ -19,7 +18,7 @@ in {
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
age.secrets.nextcloud_admin = {
file = ../../../../secrets/nextcloud_admin.age;
owner = "nextcloud";
@ -53,7 +52,7 @@ in {
};
# nextcloud module configures nginx, just need to specify SSL stuffs here
services.nginx.virtualHosts.${config.services.nextcloud.hostName} = mkIf (cfg.acmeCertName != "") {
services.nginx.virtualHosts.${config.services.nextcloud.hostName} = lib.mkIf (cfg.acmeCertName != "") {
forceSSL = true;
useACMEHost = cfg.acmeCertName;
};