diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-26 12:06:25 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-26 12:06:25 +0000 |
commit | 45003ba5f9ca91e9f9c30202bc4865e050586377 (patch) | |
tree | 2a211004faf5993b9c09efde82c0034c39b89cef /nixos/modules/services/networking | |
parent | cbdb0976298f9ea56f06ce6b0cd132d33219ce9c (diff) | |
parent | 64d2892c925212675e307ba4b31268eba7064add (diff) | |
download | nixpkgs-45003ba5f9ca91e9f9c30202bc4865e050586377.tar nixpkgs-45003ba5f9ca91e9f9c30202bc4865e050586377.tar.gz nixpkgs-45003ba5f9ca91e9f9c30202bc4865e050586377.tar.bz2 nixpkgs-45003ba5f9ca91e9f9c30202bc4865e050586377.tar.lz nixpkgs-45003ba5f9ca91e9f9c30202bc4865e050586377.tar.xz nixpkgs-45003ba5f9ca91e9f9c30202bc4865e050586377.tar.zst nixpkgs-45003ba5f9ca91e9f9c30202bc4865e050586377.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services/networking')
-rw-r--r-- | nixos/modules/services/networking/go-neb.nix | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/go-neb.nix b/nixos/modules/services/networking/go-neb.nix index 991ae38f30a..765834fad83 100644 --- a/nixos/modules/services/networking/go-neb.nix +++ b/nixos/modules/services/networking/go-neb.nix @@ -5,7 +5,8 @@ with lib; let cfg = config.services.go-neb; - configFile = pkgs.writeText "config.yml" (builtins.toJSON cfg.config); + settingsFormat = pkgs.formats.yaml {}; + configFile = settingsFormat.generate "config.yaml" cfg.config; in { options.services.go-neb = { enable = mkEnableOption "Extensible matrix bot written in Go"; @@ -16,13 +17,26 @@ in { default = ":4050"; }; + secretFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/go-neb.env"; + description = '' + Environment variables from this file will be interpolated into the + final config file using envsubst with this syntax: <literal>$ENVIRONMENT</literal> + or <literal>''${VARIABLE}</literal>. + The file should contain lines formatted as <literal>SECRET_VAR=SECRET_VALUE</literal>. + This is useful to avoid putting secrets into the nix store. + ''; + }; + baseUrl = mkOption { type = types.str; description = "Public-facing endpoint that can receive webhooks."; }; config = mkOption { - type = types.uniq types.attrs; + inherit (settingsFormat) type; description = '' Your <filename>config.yaml</filename> as a Nix attribute set. See <link xlink:href="https://github.com/matrix-org/go-neb/blob/master/config.sample.yaml">config.sample.yaml</link> @@ -32,18 +46,30 @@ in { }; config = mkIf cfg.enable { - systemd.services.go-neb = { + systemd.services.go-neb = let + finalConfigFile = if cfg.secretFile == null then configFile else "/var/run/go-neb/config.yaml"; + in { description = "Extensible matrix bot written in Go"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; environment = { BASE_URL = cfg.baseUrl; BIND_ADDRESS = cfg.bindAddress; - CONFIG_FILE = configFile; + CONFIG_FILE = finalConfigFile; }; serviceConfig = { + ExecStartPre = lib.optional (cfg.secretFile != null) + (pkgs.writeShellScript "pre-start" '' + umask 077 + export $(xargs < ${cfg.secretFile}) + ${pkgs.envsubst}/bin/envsubst -i "${configFile}" > ${finalConfigFile} + chown go-neb ${finalConfigFile} + ''); + PermissionsStartOnly = true; + RuntimeDirectory = "go-neb"; ExecStart = "${pkgs.go-neb}/bin/go-neb"; + User = "go-neb"; DynamicUser = true; }; }; |