From 458fe33260e5ff18ae0458ea1d153d2f79e7788c Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 15 Jun 2019 08:15:28 +0000 Subject: [PATCH] conf/profile, make, scripts: Search-and-replace cvs.jannet.de -> cvs.janware.com Signed-off-by: Jan Lindemann --- conf/profile/cvsroot.sh | 2 +- make/dav.mk | 2 +- make/defs-dev.mk | 2 +- make/defs-dist.mk | 2 +- make/dist.mk | 2 +- make/tex.mk | 2 +- scripts/integrate-distro.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/profile/cvsroot.sh b/conf/profile/cvsroot.sh index 4de9294f..141aff3d 100644 --- a/conf/profile/cvsroot.sh +++ b/conf/profile/cvsroot.sh @@ -1,3 +1,3 @@ -CVSROOT=:ext:`whoami`@cvs.jannet.de:/srv/cvs +CVSROOT=:ext:`whoami`@cvs.janware.com:/srv/cvs CVS_RSH=/opt/jw-build/bin/jw-build-ssh.sh export CVSROOT CVS_RSH diff --git a/make/dav.mk b/make/dav.mk index 504291b0..6f62ee51 100644 --- a/make/dav.mk +++ b/make/dav.mk @@ -2,7 +2,7 @@ DAV_GROUP ?= jannet DAV_GROUP_PROJECT ?= $(PROJECT_DIRNAME) DAV_GROUP_PROJECT_GROUP ?= $(shell id -gn) DAV_GROUP_PROJECT_USER ?= $(shell id -un) -DAV_SERVER ?= cvs.jannet.de +DAV_SERVER ?= cvs.janware.com DAV_RSYNC_SERVER ?= $(DAV_SERVER) DAV_RSYNC_DIR ?= /srv/dav/pub/groups/$(DAV_GROUP)/$(DAV_GROUP_PROJECT) DAV_RSYNC_URL = $(DAV_RSYNC_SERVER):$(DAV_RSYNC_DIR) diff --git a/make/defs-dev.mk b/make/defs-dev.mk index 4c0b5569..4e73fd13 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -37,7 +37,7 @@ PROFILE_DIR ?= $(ENV_PREFIX)$(HOME)/.profile.d$(FLAVOUR_PATH_SUF INSTALL_CRONTABDIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)cron.d INSTALL_PKG_CONFIGDIR ?= $(CONFIG_DIR)/pkgconfig PIDDIR ?= $(VAR_PREFIX)$(FLAVOUR_PATH_PREFIX)run -DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) +DOWNLOADDIRS ?= root@cvs.janware.com:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) WORKING_DIR ?= $(ENV_PREFIX)$(HOME) WORKING_DIR ?= $(VAR_PREFIX)/lock JAVADIR ?= $(JAVA_PREFIX)/share/java diff --git a/make/defs-dist.mk b/make/defs-dist.mk index 0f1f8d3d..a0fbc4b6 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -37,7 +37,7 @@ PROFILE_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)profile.d INSTALL_CRONTABDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)cron.d INSTALL_PKG_CONFIGDIR ?= $(ENV_PREFIX)$(SYSTEM_LIBDIR)/pkgconfig PIDDIR ?= $(VAR_PREFIX)/run -DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) +DOWNLOADDIRS ?= root@cvs.janware.com:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) WORKING_DIR ?= $(VAR_PREFIX)/coredumps WORKING_DIR ?= $(VAR_PREFIX)/lock JAVADIR ?= $(JAVA_PREFIX)/share/java diff --git a/make/dist.mk b/make/dist.mk index 52a7c2c9..ee06f92c 100644 --- a/make/dist.mk +++ b/make/dist.mk @@ -1,7 +1,7 @@ # -- general, and important LOCAL_PROJECT = $(PROJECT) -TARGET_HOST = cvs.jannet.de +TARGET_HOST = cvs.janware.com UPLOAD_DOCUMENT_ROOT = /usr/local/httpd/htdocs UPLOAD_VIRTUAL_SERVER_ROOT = www.jannet.de_443 TARGET_USER = root diff --git a/make/tex.mk b/make/tex.mk index ed40f6fa..58089d6a 100644 --- a/make/tex.mk +++ b/make/tex.mk @@ -50,7 +50,7 @@ ICON_CONTENTS ?= contents.png # -- web publishing HTMLDIR ?= $(TOPIC) -TARGET_HOST ?= cvs.jannet.de +TARGET_HOST ?= cvs.janware.com TARGET_DIR ?= /home/wwwrun/dat/htdocs/jannet.de_443/upload/$(CUSTOMER)/projects/$(PROJECT)/doc/$(TOPIC) TARGET_DIR_MODE ?= 755 TARGET_FILE_MODE ?= 644 diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh index eaa4b8c7..2261e0bb 100644 --- a/scripts/integrate-distro.sh +++ b/scripts/integrate-distro.sh @@ -1370,7 +1370,7 @@ cmd_install() run_hook pkg-installed - export CVSROOT=:ext:$scm_user@cvs.jannet.de:/srv/cvs + export CVSROOT=:ext:$scm_user@cvs.janware.com:/srv/cvs echo "=== running jcs fetch" run_chroot jcs fetch reset_host_files