server/dev.cfg | 10 +++++++++-
server/mirrormanager/ubuntu.py | 22 ++++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
New commits:
commit 3a15ddc0aac84bf1a30c1ed910be7c1f13d09f8e
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Sat Oct 30 17:02:34 2010 -0500
add ubuntu initialization code
diff --git a/server/mirrormanager/ubuntu.py b/server/mirrormanager/ubuntu.py
new file mode 100644
index 0000000..79f8a9a
--- /dev/null
+++ b/server/mirrormanager/ubuntu.py
@@ -0,0 +1,22 @@
+from mirrormanager.model import Product, Category, Arch, Directory
+
+productname = 'Ubuntu'
+categories = {'Ubuntu
Archive':('ubuntu','http://archive.ubuntu.com'),
+ 'Ubuntu CD Images':('releases',
'http://releases.ubuntu.com'),
+ 'Ubuntu Ports Archive':('ports',
'http://ports.ubuntu.com'),
+ 'Ubuntu Security Archive':('security',
'http://security.ubuntu.com'),
+ }
+primary_arches = ('i386', 'amd64')
+secondary_arches = ('armel', 'powerpc', 'ia64', 'sparc',
'hppa', 'lpia')
+
+def setup_ubuntu():
+ product = Product(name=productname)
+
+ for name, (dirname, canonicalhost) in categories.iteritems():
+ d = Directory(name=dirname)
+ Category(product=product, name=name, canonicalhost=canonicalhost, topdir=d)
+
+ for a in primary_arches:
+ Arch(name=a, primaryArch=True)
+ for a in secondary_arches:
+ Arch(name=a, primaryArch=False)
commit c3304d9ca68aa004c50b6ff1076e113553b33aae
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Sat Oct 30 16:59:46 2010 -0500
dev.cfg: add ubuntu to umdl
diff --git a/server/dev.cfg b/server/dev.cfg
index 962453d..0c92d13 100644
--- a/server/dev.cfg
+++ b/server/dev.cfg
@@ -44,7 +44,15 @@ umdl.master_directories = ''' [
{ 'type':'rsync',
'url':'rsync://secondary1.fedora.phx.redhat.com/alt/',
'category':'Fedora Other' },
{ 'type':'directory', 'path':'/pub/fedora/linux/',
- 'category':'Fedora Linux', 'excludes':['.*/core/?.*',
'.*/extras/?.*', '.*/[7-8]/?.*' ] }
+ 'category':'Fedora Linux', 'excludes':['.*/core/?.*',
'.*/extras/?.*', '.*/[7-8]/?.*' ] },
+# { 'type':'rsync',
'url':'rsync://archive.ubuntu.com/ubuntu/',
+# 'category':'Ubuntu Archive' },
+# { 'type':'rsync',
'url':'rsync://releases.ubuntu.com/releases/',
+# 'category':'Ubuntu CD Images' },
+# { 'type':'rsync',
'url':'rsync://ports.ubuntu.com/ubuntu-ports/',
+# 'category':'Ubuntu Ports Archive' },
+# { 'type':'rsync',
'url':'rsync://security.ubuntu.com/ubuntu/',
+# 'category':'Ubuntu Security Archive' },
] '''
# manage-repo-redirects (mrr) repository definition