janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

projects-dir.mk: Improve passwordless login

Browse source 
Remove some more obstacles to passwordless login during automated
builds.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-04-12 14:17:01 +00:00
commit 463092cbef
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
make/projects-dir.mk
View file

@ -37,7 +37,7 @@ ifeq ($(GIT_SSH),)
export GIT_SSH := $(CVS_RSH)
endif
export JW_BUILD_SSH_EXTRA_OPTS = -o ControlMaster=auto -o ControlPath=./%r@build:%p -o ControlPersist=60s
export JW_BUILD_SSH_EXTRA_OPTS = -o ControlMaster=auto -o ControlPath=/tmp/%r@build:%p -o ControlPersist=3m
ifneq ($(CLONE_FROM_USER),)
export PGIT_CLONE_FROM_USER = $(CLONE_FROM_USER)
@ -60,6 +60,7 @@ PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-m
BROWSER ?= firefox
GIT_SRV_ADMIN = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh
CVS_ADMIN = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/cvs-admin.sh
# ------------ targets
all: pull.done

9
scripts/purge-stale-projects.sh
View file

@ -41,10 +41,15 @@ check_scm()
fi
}
ssh=ssh
[ "$CVS_RSH" ] && ssh="$CVS_RSH"
[ "$GIT_SSH" ] && ssh="$GIT_SSH"
[ "$JANWARE_USER" ] || JANWARE_USER=`whoami`
ssh="$ssh -l $JANWARE_USER"
local_cvs_proj=`ls -d */CVS 2>/dev/null | sed 's%/[^/]*%%'`
local_git_proj=`ls -d */.git 2>/dev/null | sed 's%/[^/]*%%'`
remote_cvs_proj=`ssh cvs.jannet.de find /home/jannet/arc/cvs/proj -maxdepth 1 -mindepth 1 -type d -executable -readable | sed 's%.*/%%'`
remote_git_proj=`ssh git.jannet.de git-srv-admin.sh -j list-personal-projects`
remote_cvs_proj=`$ssh cvs.jannet.de find /home/jannet/arc/cvs/proj -maxdepth 1 -mindepth 1 -type d -executable -readable | sed 's%.*/%%'`
remote_git_proj=`$ssh git.jannet.de git-srv-admin.sh -j list-personal-projects`
date=`date +'%Y%m%d'`
myname=`basename $0`