summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2019-05-17 14:02:22 +0200
committertv <tv@krebsco.de>2019-05-17 14:02:22 +0200
commita666abeaabbed73749cd5e2f1745b4a4527c4bc6 (patch)
tree5440d2059dd92f3635cb4a117ec040394a89eed1
parent2950b893b03253ef8000e939915bb9c8c1f1f524 (diff)
github-hosts-sync: make user name/mail overridable
-rw-r--r--krebs/3modules/github-hosts-sync.nix3
-rwxr-xr-xkrebs/5pkgs/simple/github-hosts-sync/src/hosts-sync6
2 files changed, 7 insertions, 2 deletions
diff --git a/krebs/3modules/github-hosts-sync.nix b/krebs/3modules/github-hosts-sync.nix
index 6ffaf5503..0b7d56098 100644
--- a/krebs/3modules/github-hosts-sync.nix
+++ b/krebs/3modules/github-hosts-sync.nix
@@ -38,6 +38,8 @@ let
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment = {
+ GITHUB_HOST_SYNC_USER_MAIL = user.mail;
+ GITHUB_HOST_SYNC_USER_NAME = user.name;
GITHUB_HOST_SYNC_SRCDIR = cfg.srcDir;
GITHUB_HOST_SYNC_WORKTREE = cfg.workTree;
GITHUB_HOST_SYNC_URL = cfg.url;
@@ -67,6 +69,7 @@ let
};
user = rec {
+ mail = "${name}@${config.krebs.build.host.name}";
name = "github-hosts-sync";
uid = genid_uint31 name;
};
diff --git a/krebs/5pkgs/simple/github-hosts-sync/src/hosts-sync b/krebs/5pkgs/simple/github-hosts-sync/src/hosts-sync
index d2017ef63..a8973e72b 100755
--- a/krebs/5pkgs/simple/github-hosts-sync/src/hosts-sync
+++ b/krebs/5pkgs/simple/github-hosts-sync/src/hosts-sync
@@ -5,6 +5,8 @@ exec >&2
hosts_srcdir=$GITHUB_HOST_SYNC_SRCDIR
hosts_worktree=${GITHUB_HOST_SYNC_WORKTREE-/tmp/hosts}
hosts_url=${GITHUB_HOST_SYNC_URL-git@github.com:krebs/hosts.git}
+user_mail=${GITHUB_HOST_SYNC_USER_MAIL-$LOGNAME@$(hostname)}
+user_name=${GITHUB_HOST_SYNC_USER_NAME-$LOGNAME}
test -d "$hosts_worktree" || git clone "$hosts_url" "$hosts_worktree"
@@ -24,8 +26,8 @@ rsync \
git add .
if test -n "$(git status --porcelain)"; then
- git config user.email "$LOGNAME@$(hostname)"
- git config user.name "$LOGNAME"
+ git config user.email "$user_mail"
+ git config user.name "$user_name"
git commit -m bump
git push
fi