commit dd6d09f1c840917622881570929331e67b9a9779 · ryan.freumh.org/eilean-nix

+8 -15
modules/radicale.nix
···

       13
       13
        
               readOnly = true;

     

       14
       14
        
               default = name;

     

       15
       15
        
             };

     

       16
       16
       -
             passwordFile = mkOption {

     

       17
       17
       -
               type = types.nullOr types.str;

     

       18
       18
       -
             };

     

       16
       16
       +
             passwordFile = mkOption { type = types.nullOr types.str; };

     

       19
       17
        
           };

     

       20
       18
        
         };

     

       21
       19
        
       in {

     
···

       31
       29
        
           services.radicale = {

     

       32
       30
        
             enable = true;

     

       33
       31
        
             settings = {

     

       34
       34
       -
               server = {

     

       35
       35
       -
                 hosts = [ "0.0.0.0:5232" ];

     

       36
       36
       -
               };

     

       32
       32
       +
               server = { hosts = [ "0.0.0.0:5232" ]; };

     

       37
       33
        
               auth = {

     

       38
       34
        
                 type = "htpasswd";

     

       39
       35
        
                 htpasswd_filename = passwdFile;

     

       40
       36
        
                 htpasswd_encryption = "bcrypt";

     

       41
       37
        
               };

     

       42
       42
       -
               storage = {

     

       43
       43
       -
                 filesystem_folder = "/var/lib/radicale/collections";

     

       44
       44
       -
               };

     

       38
       38
       +
               storage = { filesystem_folder = "/var/lib/radicale/collections"; };

     

       45
       39
        
             };

     

       46
       40
        
           };

     

       47
       41
        
       

     

       48
       42
        
           systemd.services.radicale = {

     

       49
       43
        
             serviceConfig.ReadWritePaths = [ "/var/lib/radicale" ];

     

       50
       50
       -
             preStart =''

     

       44
       44
       +
             preStart = ''

     

       51
       45
        
               if (! test -d "${passwdDir}"); then

     

       52
       46
        
                 mkdir "${passwdDir}"

     

       53
       47
        
                 chmod 755 "${passwdDir}"

     
···

       58
       52
        
               cat <<EOF > ${passwdFile}

     

       59
       53
        
       

     

       60
       54
        
               ${lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value:

     

       61
       61
       -
                 "$(${pkgs.apacheHttpd}/bin/htpasswd -nbB \"${name}\" \"$(head -n 2 ${value.passwordFile})\")"

     

       62
       62
       -
               ) cfg.radicale.users)}

     

       55
       55
       +
                 ''

     

       56
       56
       +
                   $(${pkgs.apacheHttpd}/bin/htpasswd -nbB "${name}" "$(head -n 2 ${value.passwordFile})")'')

     

       57
       57
       +
                 cfg.radicale.users)}

     

       63
       58
        
               EOF

     

       64
       59
        
             '';

     

       65
       60
        
           };

     
···

       71
       66
        
               "cal.${domain}" = {

     

       72
       67
        
                 forceSSL = true;

     

       73
       68
        
                 enableACME = true;

     

       74
       74
       -
                 locations."/" = {

     

       75
       75
       -
                   proxyPass = "http://localhost:5232";

     

       76
       76
       -
                 };

     

       69
       69
       +
                 locations."/" = { proxyPass = "http://localhost:5232"; };

     

       77
       70
        
               };

     

       78
       71
        
             };

     

       79
       72
        
           };