ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 04:57:56 +03:00
Code Issues Projects Releases Wiki Activity

sourcehut: fix up some more bin paths

Browse Source 
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
This commit is contained in:
Christoph Heiss 2023-07-24 14:49:51 +02:00 committed by Christoph Heiss
parent 5841d27497
commit 6b25e09d2d
No known key found for this signature in database
GPG Key ID: 73D5E7FDEE3DE49A
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nixos/modules/services/misc/sourcehut/default.nix
View File

@ -408,8 +408,8 @@ in
This setting is propagated to newer and existing repositories. This setting is propagated to newer and existing repositories.
''; '';
type = types.str; type = types.str;
default = "${cfg.python}/bin/hgsrht-hook-changegroup"; default = "${pkgs.sourcehut.hgsrht}/bin/hgsrht-hook-changegroup";
defaultText = "\${cfg.python}/bin/hgsrht-hook-changegroup"; defaultText = "\${pkgs.sourcehut.hgsrht}/bin/hgsrht-hook-changegroup";
}; };
repos = mkOption { repos = mkOption {
description = lib.mdDoc '' description = lib.mdDoc ''
@ -795,10 +795,11 @@ in
environment.etc."ssh/sourcehut/subdir/srht-dispatch" = { environment.etc."ssh/sourcehut/subdir/srht-dispatch" = {
# sshd_config(5): The program must be owned by root, not writable by group or others # sshd_config(5): The program must be owned by root, not writable by group or others
mode = "0755"; mode = "0755";
source = pkgs.writeShellScript "srht-dispatch" '' source = pkgs.writeShellScript "srht-dispatch-wrapper" ''
set -e set -e
set -x
cd /etc/ssh/sourcehut/subdir cd /etc/ssh/sourcehut/subdir
${cfg.python}/bin/gitsrht-dispatch "$@" ${pkgs.sourcehut.gitsrht}/bin/gitsrht-dispatch "$@"
''; '';
}; };
systemd.services.sshd = { systemd.services.sshd = {
@ -882,7 +883,7 @@ in
set -e set -e
test -e "''$PWD"/config.ini || test -e "''$PWD"/config.ini ||
ln -s /run/sourcehut/hgsrht/config.ini "''$PWD"/config.ini ln -s /run/sourcehut/hgsrht/config.ini "''$PWD"/config.ini
exec -a "$0" ${cfg.python}/bin/hgsrht-hook-changegroup "$@" exec -a "$0" ${pkgs.sourcehut.hgsrht}/bin/hgsrht-hook-changegroup "$@"
''}:/usr/bin/hgsrht-hook-changegroup" ''}:/usr/bin/hgsrht-hook-changegroup"
]; ];
}; };
@ -1195,7 +1196,7 @@ in
extraServices.listssrht-lmtp = { extraServices.listssrht-lmtp = {
wants = [ "postfix.service" ]; wants = [ "postfix.service" ];
unitConfig.JoinsNamespaceOf = optional cfg.postfix.enable "postfix.service"; unitConfig.JoinsNamespaceOf = optional cfg.postfix.enable "postfix.service";
serviceConfig.ExecStart = "${cfg.python}/bin/listssrht-lmtp"; serviceConfig.ExecStart = "${pkgs.sourcehut.listssrht}/bin/listssrht-lmtp";
# Avoid crashing: os.chown(sock, os.getuid(), sock_gid) # Avoid crashing: os.chown(sock, os.getuid(), sock_gid)
serviceConfig.PrivateUsers = mkForce false; serviceConfig.PrivateUsers = mkForce false;
}; };
@ -1274,7 +1275,7 @@ in
else else
# In order to load config.ini # In order to load config.ini
if cd /run/sourcehut/metasrht if cd /run/sourcehut/metasrht
then exec ${cfg.python}/bin/metasrht-manageuser "$@" then exec ${pkgs.sourcehut.metasrht}/bin/metasrht-manageuser "$@"
else cat <<EOF else cat <<EOF
Please run: sudo systemctl start metasrht Please run: sudo systemctl start metasrht
EOF EOF
@ -1338,7 +1339,7 @@ in
extraServices.todosrht-lmtp = { extraServices.todosrht-lmtp = {
wants = [ "postfix.service" ]; wants = [ "postfix.service" ];
unitConfig.JoinsNamespaceOf = optional cfg.postfix.enable "postfix.service"; unitConfig.JoinsNamespaceOf = optional cfg.postfix.enable "postfix.service";
serviceConfig.ExecStart = "${cfg.python}/bin/todosrht-lmtp"; serviceConfig.ExecStart = "${pkgs.sourcehut.todosrht}/bin/todosrht-lmtp";
# Avoid crashing: os.chown(sock, os.getuid(), sock_gid) # Avoid crashing: os.chown(sock, os.getuid(), sock_gid)
serviceConfig.PrivateUsers = mkForce false; serviceConfig.PrivateUsers = mkForce false;
}; };