Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wiki: allow push to git

Browse Source
This commit is contained in:
lassulus 2020-08-12 22:52:37 +02:00
parent b42fe392f3
commit 03939b14e1
1 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
krebs/2configs/wiki.nix
View File

@ -1,12 +1,8 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
with import <stockholm/lib>; with import <stockholm/lib>;
let
{ setupGit = ''
krebs.gollum = {
enable = true;
extraConfig = ''
Gollum::Hook.register(:post_commit, :hook_id) do |committer, sha1|
system('${toString (pkgs.writers.writeDash "push_cgit" ''
export PATH=${makeBinPath [ pkgs.git ]} export PATH=${makeBinPath [ pkgs.git ]}
export GIT_SSH_COMMAND='${pkgs.openssh}/bin/ssh -i ${config.krebs.gollum.stateDir}/.ssh/id_ed25519' export GIT_SSH_COMMAND='${pkgs.openssh}/bin/ssh -i ${config.krebs.gollum.stateDir}/.ssh/id_ed25519'
repo='git@localhost:wiki' repo='git@localhost:wiki'
@ -16,8 +12,26 @@ with import <stockholm/lib>;
elif test "$url" != "$repo"; then elif test "$url" != "$repo"; then
git remote set-url origin "$repo" git remote set-url origin "$repo"
fi fi
'';
pushGollum = pkgs.writeDash "push_gollum" ''
${setupGit}
git fetch origin
git merge --ff-only origin/master
'';
pushCgit = pkgs.writeDash "push_cgit" ''
${setupGit}
git push origin master git push origin master
'')}') '';
in
{
krebs.gollum = {
enable = true;
extraConfig = ''
Gollum::Hook.register(:post_commit, :hook_id) do |committer, sha1|
system('${pushCgit}')
end end
''; '';
}; };
@ -47,27 +61,27 @@ with import <stockholm/lib>;
name = "gollum"; name = "gollum";
pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMXbjDnQWg8EECsNRZZWezocMIiuENhCSQFcFUXcsOQ6"; pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMXbjDnQWg8EECsNRZZWezocMIiuENhCSQFcFUXcsOQ6";
} }
config.krebs.users.lass-mors ] ++ (attrValues config.krebs.users);
];
repo = [ config.krebs.git.repos.wiki ]; repo = [ config.krebs.git.repos.wiki ];
perm = push ''refs/*'' [ create merge ]; perm = push ''refs/heads/master'' [ create merge ];
} }
]; ];
repos.wiki = { repos.wiki = {
public = true; public = true;
name = "wiki"; name = "wiki";
hooks = { hooks = {
post-receive = pkgs.git-hooks.irc-announce { post-receive = ''
${pkgs.git-hooks.irc-announce {
channel = "#xxx"; channel = "#xxx";
refs = [ refs = [
"refs/heads/master" "refs/heads/master"
"refs/heads/newest"
"refs/tags/*"
]; ];
nick = config.networking.hostName; nick = config.networking.hostName;
server = "irc.r"; server = "irc.r";
verbose = true; verbose = true;
}; }}
/run/wrappers/bin/sudo -S -u gollum ${pushGollum}
'';
}; };
}; };
}; };
@ -77,4 +91,8 @@ with import <stockholm/lib>;
owner = { name = "gollum"; }; owner = { name = "gollum"; };
source-path = "${<secrets/gollum.id_ed25519>}"; source-path = "${<secrets/gollum.id_ed25519>}";
}; };
security.sudo.extraConfig = ''
git ALL=(gollum) NOPASSWD: ${pushGollum}
'';
} }