Merge master into staging-next

  them and comparing their contents. If they are different but only

  `X-Reload-Triggers` in the `[Unit]` section is changed, **reload** the unit.

  The NixOS module system allows setting these triggers with the option

  [systemd.services.\<name\>.reloadTriggers](#opt-systemd.services). If the

  [systemd.services.\<name\>.reloadTriggers](#opt-systemd.services). There are

  some additional keys in the `[Unit]` section that are ignored as well. If the

  unit files differ in any way, the following actions are performed:

  - `.path` and `.slice` units are ignored. There is no need to restart them

  - The rest of the units (mostly `.service` units) are then **reload**ed if

    `X-ReloadIfChanged` in the `[Service]` section is set to `true` (exposed

    via [systemd.services.\<name\>.reloadIfChanged](#opt-systemd.services)).

    A little exception is done for units that were deactivated in the meantime,

    for example because they require a unit that got stopped before. These

    are **start**ed instead of reloaded.

  - If the reload flag is not set, some more flags decide if the unit is

    skipped. These flags are `X-RestartIfChanged` in the `[Service]` section

        <emphasis role="strong">reload</emphasis> the unit. The NixOS

        module system allows setting these triggers with the option

        <link linkend="opt-systemd.services">systemd.services.&lt;name&gt;.reloadTriggers</link>.

        If the unit files differ in any way, the following actions are

        performed:

        There are some additional keys in the <literal>[Unit]</literal>

        section that are ignored as well. If the unit files differ in

        any way, the following actions are performed:

      </para>

      <itemizedlist>

        <listitem>

            <literal>[Service]</literal> section is set to

            <literal>true</literal> (exposed via

            <link linkend="opt-systemd.services">systemd.services.&lt;name&gt;.reloadIfChanged</link>).

            A little exception is done for units that were deactivated

            in the meantime, for example because they require a unit

            that got stopped before. These are

            <emphasis role="strong">start</emphasis>ed instead of

            reloaded.

          </para>

        </listitem>

        <listitem>

          <link linkend="opt-services.prosody-filer.enable">services.prosody-filer</link>.

        </para>

      </listitem>

      <listitem>

        <para>

          <link xlink:href="https://github.com/rfjakob/systembus-notify">systembus-notify</link>,

          allow system level notifications to reach the users. Available

          as

          <link xlink:href="opt-services.systembus-notify.enable">services.systembus-notify</link>.

          Please keep in mind that this service should only be enabled

          on machines with fully trusted users, as any local user is

          able to DoS user sessions by spamming notifications.

        </para>

      </listitem>

      <listitem>

        <para>

          <link xlink:href="https://github.com/audreyt/ethercalc">ethercalc</link>,

- [prosody-filer](https://github.com/ThomasLeister/prosody-filer), a server for handling XMPP HTTP Upload requests. Available at [services.prosody-filer](#opt-services.prosody-filer.enable).

- [systembus-notify](https://github.com/rfjakob/systembus-notify), allow system level notifications to reach the users. Available as [services.systembus-notify](opt-services.systembus-notify.enable). Please keep in mind that this service should only be enabled on machines with fully trusted users, as any local user is able to DoS user sessions by spamming notifications.

- [ethercalc](https://github.com/audreyt/ethercalc), an online collaborative

  spreadsheet. Available as [services.ethercalc](options.html#opt-services.ethercalc.enable).

  ./services/system/nscd.nix

  ./services/system/saslauthd.nix

  ./services/system/self-deploy.nix

  ./services/system/systembus-notify.nix

  ./services/system/uptimed.nix

  ./services/torrent/deluge.nix

  ./services/torrent/flexget.nix