diff options
author | Aneesh Agrawal <aneeshusa@gmail.com> | 2017-09-17 22:11:23 -0700 |
---|---|---|
committer | Aneesh Agrawal <aneeshusa@gmail.com> | 2017-09-18 00:29:01 -0700 |
commit | fcd590d116e22c01092808d9a533cf28a2bebedb (patch) | |
tree | e422c4dedee3d9157f7367f4f1e5ffbaf7426876 /nixos | |
parent | 018a5ae2f4e01c0e7ccd63a58c308082387fc73b (diff) | |
download | nixlib-fcd590d116e22c01092808d9a533cf28a2bebedb.tar nixlib-fcd590d116e22c01092808d9a533cf28a2bebedb.tar.gz nixlib-fcd590d116e22c01092808d9a533cf28a2bebedb.tar.bz2 nixlib-fcd590d116e22c01092808d9a533cf28a2bebedb.tar.lz nixlib-fcd590d116e22c01092808d9a533cf28a2bebedb.tar.xz nixlib-fcd590d116e22c01092808d9a533cf28a2bebedb.tar.zst nixlib-fcd590d116e22c01092808d9a533cf28a2bebedb.zip |
radicale: Add extraArgs option to assist in data migration
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1709.xml | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/radicale.nix | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index f271451970a2..35534af1f1dc 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -107,7 +107,7 @@ rmdir /var/lib/ipfs/.ipfs The <literal>mysql</literal> default <literal>dataDir</literal> has changed from <literal>/var/mysql</literal> to <literal>/var/lib/mysql</literal>. </para> <para> - Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found <link xlink:href="http://radicale.org/1to2/"> here </link>. It is also possible to use the newer version by setting the <literal>package</literal> to <literal>radicale2</literal>, which is done automatically when <literal>stateVersion</literal> is 17.09 or higher. + Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found <link xlink:href="http://radicale.org/1to2/"> here </link>. It is also possible to use the newer version by setting the <literal>package</literal> to <literal>radicale2</literal>, which is done automatically when <literal>stateVersion</literal> is 17.09 or higher. The <literal>extraArgs</literal> option has been added to allow passing the data migration arguments specified in the instructions. </para> </listitem> <listitem> diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index f1b8edf43713..56f2e976cff5 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -48,6 +48,12 @@ in configuration file. ''; }; + + services.radicale.extraArgs = mkOption { + type = types.listOf types.string; + default = []; + description = "Extra arguments passed to the Radicale daemon."; + }; }; config = mkIf cfg.enable { @@ -71,7 +77,11 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/radicale -C ${confFile} -f"; + ExecStart = concatStringsSep " " ([ + "${cfg.package}/bin/radicale" "-C" confFile + ] ++ ( + map escapeShellArg cfg.extraArgs + )); User = "radicale"; Group = "radicale"; }; |