Unverified Commit 08fbb5de authored by Stanisław Pitucha's avatar Stanisław Pitucha Committed by GitHub
Browse files

Merge pull request #190325 from fgaz/merecat/init 

merecat: init at 2.31
parents 49ae64fb b43605fb

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

+7 −0
Original line number Diff line number Diff line
@@ -374,6 +374,13 @@ 
          <link linkend="opt-services.expressvpn.enable">services.expressvpn</link>.

        </para>

      </listitem>

      <listitem>

        <para>

          <link xlink:href="https://troglobit.com/projects/merecat/">merecat</link>,

          a small and easy HTTP server based on thttpd. Available as

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

        </para>

      </listitem>

      <listitem>

        <para>

          <link xlink:href="https://github.com/L11R/go-autoconfig">go-autoconfig</link>,

nixos/doc/manual/release-notes/rl-2211.section.md

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ In addition to numerous new and upgraded packages, this release has the followin 


- [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable).



- [merecat](https://troglobit.com/projects/merecat/), a small and easy HTTP server based on thttpd. Available as [services.merecat](#opt-services.merecat.enable)



- [go-autoconfig](https://github.com/L11R/go-autoconfig), IMAP/SMTP autodiscover server. Available as [services.go-autoconfig](#opt-services.go-autoconfig.enable).



- [tmate-ssh-server](https://github.com/tmate-io/tmate-ssh-server), server side part of [tmate](https://tmate.io/). Available as [services.tmate-ssh-server](#opt-services.tmate-ssh-server.enable).

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -1156,6 +1156,7 @@ 
  ./services/web-servers/lighttpd/collectd.nix

  ./services/web-servers/lighttpd/default.nix

  ./services/web-servers/lighttpd/gitweb.nix

  ./services/web-servers/merecat.nix

  ./services/web-servers/mighttpd2.nix

  ./services/web-servers/minio.nix

  ./services/web-servers/molly-brown.nix

nixos/modules/services/web-servers/merecat.nix

0 → 100644
+55 −0
Original line number Diff line number Diff line 
{ config, lib, pkgs, ... }:



with lib;



let

  cfg = config.services.merecat;

  format = pkgs.formats.keyValue {

    mkKeyValue = generators.mkKeyValueDefault {

      mkValueString = v:

        # In merecat.conf, booleans are "true" and "false"

        if builtins.isBool v

        then if v then "true" else "false"

        else generators.mkValueStringDefault {} v;

    } "=";

  };

  configFile = format.generate "merecat.conf" cfg.settings;



in {



  options.services.merecat = {



    enable = mkEnableOption (lib.mdDoc "Merecat HTTP server");



    settings = mkOption {

      inherit (format) type;

      default = { };

      description = lib.mdDoc ''

        Merecat configuration. Refer to merecat(8) for details on supported values.

      '';

      example = {

        hostname = "localhost";

        port = 8080;

        virtual-host = true;

        directory = "/srv/www";

      };

    };



  };



  config = mkIf cfg.enable {



    systemd.services.merecat = {

      description = "Merecat HTTP server";

      after = [ "network.target" ];

      wantedBy = [ "multi-user.target" ];

      serviceConfig = {

        DynamicUser = true;

        ExecStart = "${pkgs.merecat}/bin/merecat -n -f ${configFile}";

        AmbientCapabilities = lib.mkIf ((cfg.settings.port or 80) < 1024) [ "CAP_NET_BIND_SERVICE" ];

      };

    };



  };



}

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ in { 
  mediawiki = handleTest ./mediawiki.nix {};

  meilisearch = handleTest ./meilisearch.nix {};

  memcached = handleTest ./memcached.nix {};

  merecat = handleTest ./merecat.nix {};

  metabase = handleTest ./metabase.nix {};

  minecraft = handleTest ./minecraft.nix {};

  minecraft-server = handleTest ./minecraft-server.nix {};