diff --git a/make/git-submod.mk b/make/git-submod.mk index ccfb3ec7..cdb79e85 100644 --- a/make/git-submod.mk +++ b/make/git-submod.mk @@ -4,8 +4,8 @@ # - include # - run git-init-submod-remote -GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh -GIT_REPO_URL = ssh://$(JANWARE_USER)@git.jannet.de/srv/git/$(JANWARE_USER)/contrib/$(PROJECT_DIRNAME) +GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/git-srv-admin.sh +GIT_REPO_URL = ssh://$(JANWARE_USER)@git.janware.com/srv/git/$(JANWARE_USER)/contrib/$(PROJECT_DIRNAME) SUBMOD_PATH = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(shell $(PWD))/$(SUBMOD_SRC_DIR))) SUBMOD_SRC_DIR ?= . SUB_GIT = git -C $(SUBMOD_SRC_DIR) diff --git a/make/topdir.mk b/make/topdir.mk index 296dce02..311d0c85 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -28,7 +28,7 @@ endif include $(MODDIR)/make/defs.mk REMOTE_GIT_DIR = /srv/git/$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(RPM_PROJECT) -REMOTE_GIT_URL = ssh://$(JANWARE_USER)@git.jannet.de$(REMOTE_GIT_DIR) +REMOTE_GIT_URL = ssh://$(JANWARE_USER)@git.janware.com$(REMOTE_GIT_DIR) include $(MODDIR)/make/dirs.mk include $(MODDIR)/make/rpmdist.mk @@ -113,7 +113,7 @@ git-config: git remote set-url --push origin $(REMOTE_GIT_URL) git-clone-to-remote: - ssh git.jannet.de "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) create-personal-project $(RPM_PROJECT)" + ssh git.janware.com "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) create-personal-project $(RPM_PROJECT)" git remote set-url --push origin $(REMOTE_GIT_URL) git push --set-upstream origin master git push --all $(REMOTE_GIT_URL) @@ -128,7 +128,7 @@ git-init-remote: git-import git-clone-to-remote git-descr: $(GIT_DESCR) git-update-project-description: - ssh git.jannet.de "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) update-descriptions $(RPM_PROJECT)" + ssh git.janware.com "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) update-descriptions $(RPM_PROJECT)" projects-%: python2 $(MOD_SCRIPT_DIR)/projects.py build $* $(RPM_PROJECT)