Commit fdeaed89 authored by Pierre Schmitz's avatar Pierre Schmitz
Browse files

Use nymeria.archlinux.org as shared host for developers and trusted users

parent 36993219
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -115,6 +115,6 @@ dist:
	gpg --detach-sign --use-agent devtools-$(V).tar.gz

upload:
	scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig gerolde.archlinux.org:/srv/ftp/other/devtools/
	scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig nymeria.archlinux.org:/srv/ftp/other/devtools/

.PHONY: all clean install uninstall dist upload
+2 −2
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ fi

case $scriptname in
	archco)
		SVNURL="svn+ssh://gerolde.archlinux.org/srv/svn-packages";;
		SVNURL="svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn";;
	communityco)
		SVNURL="svn+ssh://sigurd.archlinux.org/srv/svn-packages";;
		SVNURL="svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn";;
	*)
		die "Couldn't find svn url for $scriptname"
		;;
+1 −9
Original line number Diff line number Diff line
@@ -105,15 +105,7 @@ for _arch in ${arch[@]}; do
done

if [[ -z $server ]]; then
	case "$repo" in
		core|extra|testing|staging|kde-unstable|gnome-unstable)
			server='gerolde.archlinux.org' ;;
		community*|multilib*)
			server='sigurd.archlinux.org' ;;
		*)
			server='gerolde.archlinux.org'
			msg "Non-standard repository $repo in use, defaulting to server $server" ;;
	esac
	server='nymeria.archlinux.org'
fi

if [[ -n $(svn status -q) ]]; then
+4 −4
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ fi

pkgbase="${1}"

packages_svn='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
packages_server='gerolde.archlinux.org'
community_svn='svn+ssh://sigurd.archlinux.org/srv/svn-packages'
community_server='sigurd.archlinux.org'
packages_svn='svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn'
packages_server='nymeria.archlinux.org'
community_svn='svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn'
community_server='nymeria.archlinux.org'
mirror='http://mirrors.kernel.org/archlinux'

case $scriptname in
+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ pkg_from_pkgbuild() {
chrootdir="$1"; shift
pkgs="$@"

SVNPATH='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
SVNPATH='svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn'

msg "Work will be done in $(pwd)/rebuilds"