Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modules/supervisord: init, modules/openssh: init #203

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
dc61ae1
modules/supervisord: init
zhaofengli Sep 21, 2022
3a02d09
modules/openssh: init
zhaofengli Sep 21, 2022
88b5731
fixup svd: remove cfg.configFile
zhaofengli Sep 21, 2022
a00dc02
fixup svd: mdDoc-ify everything
zhaofengli Sep 21, 2022
7834088
fixup svd: make script-generated command have normal priority
zhaofengli Sep 21, 2022
16107f5
fixup svd: add more docs
zhaofengli Sep 21, 2022
86248da
fixup svd: make environment.PATH compose better
zhaofengli Sep 21, 2022
4d93571
fixup svd: start svd during activation
zhaofengli Sep 21, 2022
3278a9c
fixup ssh: just hardcode password auth to no
zhaofengli Sep 21, 2022
269f6d1
fixup svd: use enabledPrograms for numPrograms
zhaofengli Sep 21, 2022
6e9389c
fixup svd: license header
zhaofengli Sep 21, 2022
0faa47c
fixup ssh: license header
zhaofengli Sep 21, 2022
bd44a10
fixup svd: add message when reloading
zhaofengli Sep 21, 2022
c39cb39
fixup ssh: reduce lib inherits
zhaofengli Sep 21, 2022
42b95bd
fixup svd: dont do set +e
zhaofengli Sep 21, 2022
06d245c
fixup svd: support dry-run
zhaofengli Sep 21, 2022
5ea968c
fixup ssh: don't write to stdout
zhaofengli Sep 21, 2022
f861f45
fixup svd: add autostart option
zhaofengli Sep 24, 2022
b416b58
fixup ssh: add autostart option
zhaofengli Sep 24, 2022
2f92f24
fixup ssh: also add coreutils to path
zhaofengli Sep 24, 2022
5278b3d
fixup svd: add set -e to job script
zhaofengli Sep 24, 2022
edb3247
fixup svd: only accept the typed boolean form in nix config
zhaofengli Sep 24, 2022
82c42b3
fixup svd: also accept boolean in extraConfig
zhaofengli Sep 24, 2022
56f4e44
fixup svd: disallow double quotes in environment
zhaofengli Sep 24, 2022
ca13b29
fixup ssh: Remove mdDoc for now
zhaofengli Oct 1, 2022
01a7447
fixup svd: Remove mdDoc for now
zhaofengli Oct 1, 2022
9222c03
fixup svd: use module assertions for double quote check
zhaofengli Oct 1, 2022
ba1526a
fixup svd: start supervisord in background
zhaofengli Oct 1, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion modules/supervisord.nix
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ let
autorestart = program.autoRestart;
zhaofengli marked this conversation as resolved.
Show resolved Hide resolved
environment = let
# FIXME: Make more robust
escape = builtins.replaceStrings [ "%" ] [ "%%" ];
escape = s:
assert lib.assertMsg (!(lib.hasInfix "\"" s)) "supervisord.programs.<name>.environment: Values cannot have double quotes at the moment (${s})";
zhaofengli marked this conversation as resolved.
Show resolved Hide resolved
builtins.replaceStrings [ "%" ] [ "%%" ] s;
envs = lib.mapAttrsToList (k: v: "${k}=\"${escape v}\"") program.environment;
in builtins.concatStringsSep "," envs;
} // program.extraConfig;
Expand Down