diff --git a/make/git-submod.mk b/make/git-submod.mk index a936058b..c1167bf6 100644 --- a/make/git-submod.mk +++ b/make/git-submod.mk @@ -9,8 +9,8 @@ ifeq ($(USE_USER_URL),true) endif SUBMOD_SRC_DIR ?= . -GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER_PREFIX)git.janware.com /opt/jw-pkg/bin/git-srv-admin.sh -GIT_REPO_URL = ssh://$(JANWARE_USER_PREFIX)git.janware.com/$(JANWARE_USER)/contrib/$(SUBMOD_PKG_NAME) +GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER_PREFIX)devgit.janware.com /opt/jw-pkg/bin/git-srv-admin.sh +GIT_REPO_URL = ssh://$(JANWARE_USER_PREFIX)devgit.janware.com/$(JANWARE_USER)/contrib/$(SUBMOD_PKG_NAME) SUBMOD_PATH = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(CWD)/$(SUBMOD_SRC_DIR))) SUB_GIT = git -C $(SUBMOD_SRC_DIR) diff --git a/make/projects-dir-minimal.mk b/make/projects-dir-minimal.mk index ff3aa86d..00c27052 100644 --- a/make/projects-dir-minimal.mk +++ b/make/projects-dir-minimal.mk @@ -29,10 +29,10 @@ ifeq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined) endif endif -ifneq ($(findstring ssh://git.janware.com/,$(PROJECTS_DIR_REMOTE_BASE)),) +ifneq ($(findstring ssh://devgit.janware.com/,$(PROJECTS_DIR_REMOTE_BASE)),) $(warning Using janware private SSH: $(PROJECTS_DIR_REMOTE_BASE)) PROJECTS_DIR_REMOTE_USER_SUBPATH ?= /proj -else ifneq ($(findstring ssh://git.janware.com,$(PROJECTS_DIR_REMOTE_BASE)),) +else ifneq ($(findstring ssh://devgit.janware.com,$(PROJECTS_DIR_REMOTE_BASE)),) $(warning Using janware SSH: $(PROJECTS_DIR_REMOTE_BASE)) else ifneq ($(findstring https://,$(PROJECTS_DIR_REMOTE_BASE)),) $(warning Using HTTPS: $(PROJECTS_DIR_REMOTE_BASE)) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 4e51fc39..62e9bd0b 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -141,7 +141,7 @@ endif PURGE_SH = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/purge-stale-projects.sh $(JW_PKG_BINDIR)/purge-stale-projects.sh) purge-not-found) CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/jw-pkg-create-project.sh $(JW_PKG_BINDIR)/jw-pkg-create-project.sh) jw-pkg-create-project-not-found) LIST_VCS_FILES_SH = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/scm.sh $(JW_PKG_BINDIR)/scm.sh) scm-sh-not-found) ls-files -GIT_SRV_ADMIN_SH = $(GIT_SSH) $(JANWARE_USER)@git.janware.com $(JW_PKG_REMOTE_BINDIR)/git-srv-admin.sh +GIT_SRV_ADMIN_SH = $(GIT_SSH) $(JANWARE_USER)@devgit.janware.com $(JW_PKG_REMOTE_BINDIR)/git-srv-admin.sh JANWARE_PACKAGE_FILTER = url =~ janware # ------------ projects to be built diff --git a/make/topdir.mk b/make/topdir.mk index f74e5e4d..03b012b8 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -38,7 +38,7 @@ endif include $(JWBDIR)/make/defs.mk REMOTE_GIT_DIR = /$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(PROJECT) -REMOTE_GIT_URL = ssh://$(JANWARE_USER_PREFIX)git.janware.com$(REMOTE_GIT_DIR) +REMOTE_GIT_URL = ssh://$(JANWARE_USER_PREFIX)devgit.janware.com$(REMOTE_GIT_DIR) ifneq ($(DONT_CHECK_PREREQ_DONE),true) ifndef PREREQ @@ -149,7 +149,7 @@ git-config: git remote -v | grep -q "^origin *$(REMOTE_GIT_URL)" || git remote set-url --push origin $(REMOTE_GIT_URL) git-clone-to-remote: - ssh $(JANWARE_USER)@git.janware.com "/opt/jw-pkg/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) create-personal-project $(PROJECT)" + ssh $(JANWARE_USER)@devgit.janware.com "/opt/jw-pkg/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) create-personal-project $(PROJECT)" make git-config git push --set-upstream origin $(GIT_MAIN_BRANCH) git push --all $(REMOTE_GIT_URL) @@ -165,7 +165,7 @@ git-init-remote: git-import git-clone-to-remote git-descr: $(GIT_DESCR) git-update-project-description: - ssh $(JANWARE_USER)@git.janware.com "/opt/jw-pkg/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) update-descriptions $(PROJECT)" + ssh $(JANWARE_USER)@devgit.janware.com "/opt/jw-pkg/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) update-descriptions $(PROJECT)" projects-%: $(PYTHON) $(JWB_SCRIPT_DIR)/jw-pkg.py projects build $* $(PROJECT) diff --git a/scripts/pgit.sh b/scripts/pgit.sh index d8920378..efe8e499 100644 --- a/scripts/pgit.sh +++ b/scripts/pgit.sh @@ -223,7 +223,7 @@ cmd_get() shift done - local git_srv_admin="$SSH $remote_user@git.janware.com /opt/jw-pkg/bin/git-srv-admin.sh" + local git_srv_admin="$SSH $remote_user@devgit.janware.com /opt/jw-pkg/bin/git-srv-admin.sh" local from_user="${refspec[0]}" [ "$from_user" ] || from_user=$whoami @@ -312,7 +312,7 @@ log "JW_PKG_SSH_EXTRA_OPTS=$JW_PKG_SSH_EXTRA_OPTS" cur=0 SSH=ssh [ "$GIT_SSH" ] && SSH=$GIT_SSH -global_remote_base="ssh://git.janware.com" +global_remote_base="ssh://devgit.janware.com" while [ "${1:0:1}" = - ]; do case "$1" in @@ -328,7 +328,7 @@ while [ "${1:0:1}" = - ]; do done # Only janware.com ssh git supports subdirectories below users -if [[ "$global_remote_base" =~ git.janware.com ]]; then +if [[ "$global_remote_base" =~ devgit.janware.com ]]; then global_remote_subpath="/proj" else global_remote_subpath="" diff --git a/scripts/purge-stale-projects.sh b/scripts/purge-stale-projects.sh index 7692097f..da36c36c 100644 --- a/scripts/purge-stale-projects.sh +++ b/scripts/purge-stale-projects.sh @@ -76,7 +76,7 @@ ssh="$ssh -l $JANWARE_USER" for vcs in $vcss; do case "$vcs" in cvs|CVS) host=cvs.janware.com;; - git|Git) host=git.janware.com;; + git|Git) host=devgit.janware.com;; esac $ssh $host echo hallo >/dev/null 2>&1 || fatal "Can't ssh into host $host" done @@ -112,7 +112,7 @@ for vcs in $vcss; do ;; git|Git) local_git_proj=`ls -d */.git 2>/dev/null | sed 's%/[^/]*%%'` - remote_git_proj=`$ssh git.janware.com /opt/jw-pkg/bin/git-srv-admin.sh -j list-personal-projects` + remote_git_proj=`$ssh devgit.janware.com /opt/jw-pkg/bin/git-srv-admin.sh -j list-personal-projects` for p in $local_git_proj; do [ -L $p ] && continue [ -d $p ] || continue diff --git a/src/python/jw/pkg/cmds/projects/CmdListRepos.py b/src/python/jw/pkg/cmds/projects/CmdListRepos.py index 12c4cf14..9f2bb97a 100644 --- a/src/python/jw/pkg/cmds/projects/CmdListRepos.py +++ b/src/python/jw/pkg/cmds/projects/CmdListRepos.py @@ -31,7 +31,7 @@ class CmdListRepos(Cmd): # export password = await get_password(args=args, url=args.base_url, askpass_env=askpass_env) match base_url.scheme: case 'ssh': - if re.match(r'ssh://.*git\.janware\.com/', args.base_url): + if re.match(r'ssh://.*devgit\.janware\.com/', args.base_url): from jw.pkg.lib.ec.SSHClient import SSHClient, ssh_client if username is not None: base_url.set_username(username)