diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2012-11-03 17:32:33 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2012-11-03 17:32:33 +0100 |
| commit | fdeaed894a86e3b836848ddeabf64eb93f8d8af5 (patch) | |
| tree | 9bfd4415f945057827397bae189d7183c73135e1 | |
| parent | 3699321904570c1a775d650f399f31e347defa48 (diff) | |
Use nymeria.archlinux.org as shared host for developers and trusted users
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | archco.in | 4 | ||||
| -rw-r--r-- | commitpkg.in | 10 | ||||
| -rw-r--r-- | crossrepomove.in | 8 | ||||
| -rw-r--r-- | rebuildpkgs.in | 2 |
5 files changed, 9 insertions, 17 deletions
@@ -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 @@ -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" ;; diff --git a/commitpkg.in b/commitpkg.in index be1ed71..4d13cf8 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -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 diff --git a/crossrepomove.in b/crossrepomove.in index 5a2c6e9..fa649b1 100644 --- a/crossrepomove.in +++ b/crossrepomove.in @@ -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 diff --git a/rebuildpkgs.in b/rebuildpkgs.in index f7b1612..49c7ac7 100644 --- a/rebuildpkgs.in +++ b/rebuildpkgs.in @@ -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" |