summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-01-23 00:55:35 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-01-23 00:55:35 +0100
commitd52afed8373ccb31a84089cf2dc0676ca7a3ec0a (patch)
tree0f50889378739117c968aec9b7a8ff5bbfede9b3 /home
parentc66c5506234163ee7aa33ba4c47e8c0a549b4c78 (diff)
parent146ca95e1971f3ddeb4819f22f1e97a07a659113 (diff)
downloadbuildscripts-d52afed8373ccb31a84089cf2dc0676ca7a3ec0a.tar.gz
buildscripts-d52afed8373ccb31a84089cf2dc0676ca7a3ec0a.tar.bz2
buildscripts-d52afed8373ccb31a84089cf2dc0676ca7a3ec0a.zip
Merge branch 'master' of ssh://code.x2go.org:32032/srv/git/code.x2go.org/buildscripts
Diffstat (limited to 'home')
-rw-r--r--home/.buildscripts/itzks.conf3
-rw-r--r--home/.dupload.conf37
-rw-r--r--home/.dupload.conf.nwt18
3 files changed, 19 insertions, 39 deletions
diff --git a/home/.buildscripts/itzks.conf b/home/.buildscripts/itzks.conf
index 5fd406c..f175840 100644
--- a/home/.buildscripts/itzks.conf
+++ b/home/.buildscripts/itzks.conf
@@ -9,8 +9,7 @@ GPG_KEY="E41B37C658842183"
DISTS_SUPPORTED="debian ubuntu"
BUILDS_FOR="\
-debian: lenny squeeze wheezy sid\n\
-ubuntu: lucid precise"
+debian: squeeze wheezy sid"
COMPONENT_MAIN="main"
COMPONENT_NIGHTLY="nightly"
diff --git a/home/.dupload.conf b/home/.dupload.conf
deleted file mode 100644
index 8e68292..0000000
--- a/home/.dupload.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-package config;
-
-### X2go/DEBIAN
-$cfg{"x2go-debian-sid"} = {
- fqdn => "code.x2go.org",
- login => "x2go-admin",
- method => "scpb",
- incoming => "/srv/sites/x2go.org/packages/debian/incoming/sid",
- queuedir => "/srv/sites/x2go.org/packages/debian/upload/sid",
- dinstall_runs => 1,
-};
-$cfg{"x2go-debian-wheezy"} = {
- fqdn => "code.x2go.org",
- login => "x2go-admin",
- method => "scpb",
- incoming => "/srv/sites/x2go.org/packages/debian/incoming/wheezy",
- queuedir => "/srv/sites/x2go.org/packages/debian/upload/wheezy",
- dinstall_runs => 1,
-};
-$cfg{"x2go-debian-squeeze"} = {
- fqdn => "code.x2go.org",
- login => "x2go-admin",
- method => "scpb",
- incoming => "/srv/sites/x2go.org/packages/debian/incoming/squeeze",
- queuedir => "/srv/sites/x2go.org/packages/debian/upload/squeeze",
- dinstall_runs => 1,
-};
-$cfg{"x2go-debian-lenny"} = {
- fqdn => "code.x2go.org",
- login => "x2go-admin",
- method => "scpb",
- incoming => "/srv/sites/x2go.org/packages/debian/incoming/lenny",
- queuedir => "/srv/sites/x2go.org/packages/debian/upload/lenny",
- dinstall_runs => 1,
-};
-
-1;
diff --git a/home/.dupload.conf.nwt b/home/.dupload.conf.nwt
index d4ba622..bcbd15c 100644
--- a/home/.dupload.conf.nwt
+++ b/home/.dupload.conf.nwt
@@ -34,4 +34,22 @@ $cfg{"nwt-debian-lenny"} = {
dinstall_runs => 1,
};
+$cfg{"nwt-ubuntu-precise"} = {
+ fqdn => "packages.das-netzwerkteam.de",
+ login => "nwt-admin",
+ method => "scpb",
+ incoming => "/srv/sites/das-netzwerkteam.de/packages/ubuntu/incoming/precise",
+ queuedir => "/srv/sites/das-netzwerkteam.de/packages/ubuntu/upload/precise",
+ dinstall_runs => 1,
+};
+$cfg{"nwt-ubuntu-lucid"} = {
+ fqdn => "packages.das-netzwerkteam.de",
+ login => "nwt-admin",
+ method => "scpb",
+ incoming => "/srv/sites/das-netzwerkteam.de/packages/ubuntu/incoming/lucid",
+ queuedir => "/srv/sites/das-netzwerkteam.de/packages/ubuntu/upload/lucid",
+ dinstall_runs => 1,
+};
+
+
1;