[puppet] Fix plague server target
by Nicolas Chauvet
commit 0be8e5ef0043ef223d5856fc4b1ac4441987c0b0
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Dec 14 15:24:21 2014 +0100
Fix plague server target
.../server-targets/fedora-21-rpmfusion_free.cfg | 2 +-
.../server-targets/fedora-21-rpmfusion_nonfree.cfg | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/modules/plague/files/server-targets/fedora-21-rpmfusion_free.cfg b/modules/plague/files/server-targets/fedora-21-rpmfusion_free.cfg
index 8c33f44..936a631 100644
--- a/modules/plague/files/server-targets/fedora-21-rpmfusion_free.cfg
+++ b/modules/plague/files/server-targets/fedora-21-rpmfusion_free.cfg
@@ -11,7 +11,7 @@ optional_arches = noarch x86_64 i686
[Aliases]
cvs_alias = devel
-user_aliases = rawhide-free F-20-free
+user_aliases = rawhide-free F-21-free
[Additional Package Arches]
kernel = i686
diff --git a/modules/plague/files/server-targets/fedora-21-rpmfusion_nonfree.cfg b/modules/plague/files/server-targets/fedora-21-rpmfusion_nonfree.cfg
index 2b3cc1f..b8901ac 100644
--- a/modules/plague/files/server-targets/fedora-21-rpmfusion_nonfree.cfg
+++ b/modules/plague/files/server-targets/fedora-21-rpmfusion_nonfree.cfg
@@ -11,7 +11,7 @@ optional_arches = noarch x86_64 i686
[Aliases]
cvs_alias = devel
-user_aliases = rawhide-nonfree F-20-nonfree
+user_aliases = rawhide-nonfree F-21-nonfree
[Additional Package Arches]
kernel = i686
10 years
[puppet] Update targets.pp for plague
by Nicolas Chauvet
commit 2f4c9e95e5e2d7a578a05a4bc6533b471d954dd4
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Dec 14 15:10:31 2014 +0100
Update targets.pp for plague
modules/plague/manifests/targets.pp | 37 +++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 8 deletions(-)
---
diff --git a/modules/plague/manifests/targets.pp b/modules/plague/manifests/targets.pp
index 6e4316b..61d9e32 100644
--- a/modules/plague/manifests/targets.pp
+++ b/modules/plague/manifests/targets.pp
@@ -1,22 +1,32 @@
class plague::targets {
- file { '/etc/plague/server/targets/fedora-15-rpmfusion_free.cfg':
- source => 'plague/builder/targets/fedora-15-rpmfusion_free.cfg',
+ file { '/etc/plague/server/targets/fedora-19-rpmfusion_free.cfg':
+ source => 'plague/builder/targets/fedora-19-rpmfusion_free.cfg',
ensure => present,
}
- file { '/etc/plague/server/targets/fedora-15-rpmfusion_nonfree.cfg':
- source => 'plague/builder/targets/fedora-15-rpmfusion_nonfree.cfg',
+ file { '/etc/plague/server/targets/fedora-19-rpmfusion_nonfree.cfg':
+ source => 'plague/builder/targets/fedora-19-rpmfusion_nonfree.cfg',
ensure => present,
}
- file { '/etc/plague/server/targets/fedora-16-rpmfusion_free.cfg':
- source => 'plague/builder/targets/fedora-16-rpmfusion_free.cfg',
+ file { '/etc/plague/server/targets/fedora-20-rpmfusion_free.cfg':
+ source => 'plague/builder/targets/fedora-20-rpmfusion_free.cfg',
ensure => present,
}
- file { '/etc/plague/server/targets/fedora-16-rpmfusion_nonfree.cfg':
- source => 'plague/builder/targets/fedora-16-rpmfusion_nonfree.cfg',
+ file { '/etc/plague/server/targets/fedora-20-rpmfusion_nonfree.cfg':
+ source => 'plague/builder/targets/fedora-20-rpmfusion_nonfree.cfg',
+ ensure => present,
+ }
+
+ file { '/etc/plague/server/targets/fedora-21-rpmfusion_free.cfg':
+ source => 'plague/builder/targets/fedora-21-rpmfusion_free.cfg',
+ ensure => present,
+ }
+
+ file { '/etc/plague/server/targets/fedora-21-rpmfusion_nonfree.cfg':
+ source => 'plague/builder/targets/fedora-21-rpmfusion_nonfree.cfg',
ensure => present,
}
@@ -39,4 +49,15 @@ class plague::targets {
source => 'plague/builder/targets/el-5-rpmfusion_nonfree.cfg',
ensure => present,
}
+
+ file { '/etc/plague/server/targets/el-6-rpmfusion_free.cfg':
+ source => 'plague/builder/targets/el-6-rpmfusion_free.cfg',
+ ensure => present,
+ }
+
+ file { '/etc/plague/server/targets/el-6-rpmfusion_nonfree.cfg':
+ source => 'plague/builder/targets/el-6-rpmfusion_nonfree.cfg',
+ ensure => present,
+ }
+
}
10 years
[puppet] Add mock config for f21
by Nicolas Chauvet
commit 03279a0e8f316f573c452779ac630b76fc29e421
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Dec 13 15:40:06 2014 +0100
Add mock config for f21
.../files/config/fedora-21-i386-rpmfusion_free.cfg | 71 +++++++++++++++
.../config/fedora-21-i386-rpmfusion_nonfree.cfg | 92 ++++++++++++++++++++
.../config/fedora-21-x86_64-rpmfusion_free.cfg | 74 ++++++++++++++++
.../config/fedora-21-x86_64-rpmfusion_nonfree.cfg | 89 +++++++++++++++++++
4 files changed, 326 insertions(+), 0 deletions(-)
---
diff --git a/modules/mock/files/config/fedora-21-i386-rpmfusion_free.cfg b/modules/mock/files/config/fedora-21-i386-rpmfusion_free.cfg
new file mode 100644
index 0000000..c6e7657
--- /dev/null
+++ b/modules/mock/files/config/fedora-21-i386-rpmfusion_free.cfg
@@ -0,0 +1,71 @@
+config_opts['root'] = 'fedora-21-i386-rpmfusion_free'
+config_opts['target_arch'] = 'i386'
+
+config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['dist'] = 'fc21' # only useful for --resultdir variable subst
+config_opts['macros']['%distribution'] = 'Fedora 21'
+config_opts['macros']['%vendor'] = 'RPM Fusion'
+config_opts['macros']['%packager'] = '<http://free.rpmfusion.org/>'
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+metadata_expire=0
+failovermethod=priority
+
+## repos
+
+# base (fedora/el)
+
+[fedora]
+name=Fedora 21
+baseurl=http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Everything/i386/os/
+
+[updates-released]
+name=Fedora 21, updates
+baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/21/i386/
+
+[updates-testing]
+name=Fedora 21, updates
+baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/21/i386/
+
+# rpmfusion free
+
+[rpmfusion-free]
+name=RPM Fusion free for Fedora 21
+baseurl=http://download1.rpmfusion.org/free/fedora/releases/21/Everything/i386/os/
+ http://download1.rpmfusion.org/free/fedora/releases/21/Everything/i386/os/
+
+[rpmfusion-free-updates]
+name=RPM Fusion free for Fedora 21, updates
+baseurl=http://download1.rpmfusion.org/free/fedora/updates/21/i386/
+ http://download1.rpmfusion.org/free/fedora/updates/21/i386/
+
+[rpmfusion-free-updates-testing]
+name=RPM Fusion free for Fedora 21, updates-testing
+baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/21/i386/
+ http://download1.rpmfusion.org/free/fedora/updates/testing/21/i386/
+
+[rpmfusion-free-needsign]
+name=RPM Fusion free for Fedora 21, needsign
+baseurl=http://buildsys.rpmfusion.org/plague-results/fedora-21-rpmfusion_free/
+
+# buildsys
+
+[buildsys_private]
+name=Buildsys RPM Fusion free for Fedora 21, private
+baseurl=http://buildsys.rpmfusion.org/builsys_private/fedora/21/i386/
+
+[buildsys_kernel-devel]
+name=Buildsys RPM Fusion free for Fedora 21, kernel-devel
+baseurl=http://buildsys.rpmfusion.org/kernel-devel-pkgs/fedora/21/
+
+"""
diff --git a/modules/mock/files/config/fedora-21-i386-rpmfusion_nonfree.cfg b/modules/mock/files/config/fedora-21-i386-rpmfusion_nonfree.cfg
new file mode 100644
index 0000000..e60fce1
--- /dev/null
+++ b/modules/mock/files/config/fedora-21-i386-rpmfusion_nonfree.cfg
@@ -0,0 +1,92 @@
+config_opts['root'] = 'fedora-21-i386-rpmfusion_nonfree'
+config_opts['target_arch'] = 'i386'
+
+config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['dist'] = 'fc21' # only useful for --resultdir variable subst
+config_opts['macros']['%distribution'] = 'Fedora 21'
+config_opts['macros']['%vendor'] = 'RPM Fusion'
+config_opts['macros']['%packager'] = '<http://nonfree.rpmfusion.org/>'
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+metadata_expire=0
+failovermethod=priority
+
+## repos
+
+# base (fedora/el)
+
+[fedora]
+name=Fedora 21
+baseurl=http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Everything/i386/os/
+
+[updates-released]
+name=Fedora 21, updates
+baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/21/i386/
+
+[updates-testing]
+name=Fedora 21, updates
+baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/21/i386/
+
+# rpmfusion free
+
+[rpmfusion-free]
+name=RPM Fusion free for Fedora 21
+baseurl=http://download1.rpmfusion.org/free/fedora/releases/21/Everything/i386/os/
+ http://download1.rpmfusion.org/free/fedora/releases/21/Everything/i386/os/
+
+[rpmfusion-free-updates]
+name=RPM Fusion free for Fedora 21, updates
+baseurl=http://download1.rpmfusion.org/free/fedora/updates/21/i386/
+ http://download1.rpmfusion.org/free/fedora/updates/21/i386/
+
+[rpmfusion-free-updates-testing]
+name=RPM Fusion free for Fedora 21, updates-testing
+baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/21/i386/
+ http://download1.rpmfusion.org/free/fedora/updates/testing/21/i386/
+
+[rpmfusion-free-needsign]
+name=RPM Fusion free for Fedora 21, needsign
+baseurl=http://buildsys.rpmfusion.org/plague-results/fedora-21-rpmfusion_free/
+
+# rpmfusion nonfree
+
+[rpmfusion-nonfree]
+name=RPM Fusion nonfree for Fedora 21
+baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/21/Everything/i386/os/
+ http://download1.rpmfusion.org/nonfree/fedora/releases/21/Everything/i386...
+
+[rpmfusion-nonfree-updates]
+name=RPM Fusion nonfree for Fedora 21, updates
+baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/21/i386/
+ http://download1.rpmfusion.org/nonfree/fedora/updates/21/i386/
+
+[rpmfusion-nonfree-updates-testing]
+name=RPM Fusion nonfree for Fedora 21, updates-testing
+baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/21/i386/
+ http://download1.rpmfusion.org/nonfree/fedora/updates/testing/21/i386/
+
+[rpmfusion-nonfree-needsign]
+name=RPM Fusion nonfree for Fedora 21, needsign
+baseurl=http://buildsys.rpmfusion.org/plague-results/fedora-21-rpmfusion_nonfree/
+
+# buildsys
+
+[buildsys_private]
+name=Buildsys RPM Fusion nonfree for Fedora 21, private
+baseurl=http://buildsys.rpmfusion.org/builsys_private/fedora/21/i386/
+
+[buildsys_kernel-devel]
+name=Buildsys RPM Fusion nonfree for Fedora 21, kernel-devel
+baseurl=http://buildsys.rpmfusion.org/kernel-devel-pkgs/fedora/21/
+
+"""
diff --git a/modules/mock/files/config/fedora-21-x86_64-rpmfusion_free.cfg b/modules/mock/files/config/fedora-21-x86_64-rpmfusion_free.cfg
new file mode 100644
index 0000000..35bb3d3
--- /dev/null
+++ b/modules/mock/files/config/fedora-21-x86_64-rpmfusion_free.cfg
@@ -0,0 +1,74 @@
+config_opts['root'] = 'fedora-21-x86_64-rpmfusion_free'
+config_opts['target_arch'] = 'x86_64'
+
+config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['dist'] = 'fc21' # only useful for --resultdir variable subst
+config_opts['macros']['%distribution'] = 'Fedora 21'
+config_opts['macros']['%vendor'] = 'RPM Fusion'
+config_opts['macros']['%packager'] = '<http://free.rpmfusion.org/>'
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+metadata_expire=0
+failovermethod=priority
+# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all
+# .i?86 packages except these.
+exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86
+
+## repos
+
+# base (fedora/el)
+
+[fedora]
+name=Fedora 21
+baseurl=http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Everything/x86_64/os/
+
+[updates-released]
+name=Fedora 21, updates
+baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/21/x86_64/
+
+[updates-testing]
+name=Fedora 21, updates
+baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/21/x86_64/
+
+# rpmfusion free
+
+[rpmfusion-free]
+name=RPM Fusion free for Fedora 21
+baseurl=http://download1.rpmfusion.org/free/fedora/releases/21/Everything/x86_64/os/
+ http://download1.rpmfusion.org/free/fedora/releases/21/Everything/x86_64/os/
+
+[rpmfusion-free-updates]
+name=RPM Fusion free for Fedora 21, updates
+baseurl=http://download1.rpmfusion.org/free/fedora/updates/21/x86_64/
+ http://download1.rpmfusion.org/free/fedora/updates/21/x86_64/
+
+[rpmfusion-free-updates-testing]
+name=RPM Fusion free for Fedora 21, updates-testing
+baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/21/x86_64/
+ http://download1.rpmfusion.org/free/fedora/updates/testing/21/x86_64/
+
+[rpmfusion-free-needsign]
+name=RPM Fusion free for Fedora 21, needsign
+baseurl=http://buildsys.rpmfusion.org/plague-results/fedora-21-rpmfusion_free/
+
+# buildsys
+
+[buildsys_private]
+name=Buildsys RPM Fusion free for Fedora 21, private
+baseurl=http://buildsys.rpmfusion.org/builsys_private/fedora/21/x86_64/
+
+[buildsys_kernel-devel]
+name=Buildsys RPM Fusion free for Fedora 21, kernel-devel
+baseurl=http://buildsys.rpmfusion.org/kernel-devel-pkgs/fedora/21/
+
+"""
diff --git a/modules/mock/files/config/fedora-21-x86_64-rpmfusion_nonfree.cfg b/modules/mock/files/config/fedora-21-x86_64-rpmfusion_nonfree.cfg
new file mode 100644
index 0000000..a9fde06
--- /dev/null
+++ b/modules/mock/files/config/fedora-21-x86_64-rpmfusion_nonfree.cfg
@@ -0,0 +1,89 @@
+config_opts['root'] = 'fedora-21-x86_64-rpmfusion_nonfree'
+config_opts['target_arch'] = 'x86_64'
+
+config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['dist'] = 'fc21' # only useful for --resultdir variable subst
+config_opts['macros']['%distribution'] = 'Fedora 21'
+config_opts['macros']['%vendor'] = 'RPM Fusion'
+config_opts['macros']['%packager'] = '<http://nonfree.rpmfusion.org/>'
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+metadata_expire=0
+failovermethod=priority
+# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all
+# .i?86 packages except these.
+exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86
+
+## repos
+
+# base (fedora/el)
+
+[fedora]
+name=Fedora 21
+baseurl=http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Everything/x86_64/os/
+
+[updates-released]
+name=Fedora 21, updates
+baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/21/x86_64/
+
+[updates-testing]
+name=Fedora 21, updates
+baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/21/x86_64/
+
+# rpmfusion free
+
+[rpmfusion-free]
+name=RPM Fusion free for Fedora 21
+baseurl=http://download1.rpmfusion.org/free/fedora/releases/21/Everything/x86_64/os/
+
+[rpmfusion-free-updates]
+name=RPM Fusion free for Fedora 21, updates
+baseurl=http://download1.rpmfusion.org/free/fedora/updates/21/x86_64/
+
+[rpmfusion-free-updates-testing]
+name=RPM Fusion free for Fedora 21, updates-testing
+baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/21/x86_64/
+
+[rpmfusion-free-needsign]
+name=RPM Fusion free for Fedora 21, needsign
+baseurl=http://buildsys.rpmfusion.org/plague-results/fedora-21-rpmfusion_free/
+
+# rpmfusion nonfree
+
+[rpmfusion-nonfree]
+name=RPM Fusion nonfree for Fedora 21
+baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/21/Everything/x86_64/os/
+
+[rpmfusion-nonfree-updates]
+name=RPM Fusion nonfree for Fedora 21, updates
+baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/21/x86_64/
+
+[rpmfusion-nonfree-updates-testing]
+name=RPM Fusion nonfree for Fedora 21, updates-testing
+baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/21/x86_64/
+
+[rpmfusion-nonfree-needsign]
+name=RPM Fusion nonfree for Fedora 21, needsign
+baseurl=http://buildsys.rpmfusion.org/plague-results/fedora-21-rpmfusion_nonfree/
+
+# buildsys
+
+[buildsys_private]
+name=Buildsys RPM Fusion nonfree for Fedora 21, private
+baseurl=http://buildsys.rpmfusion.org/builsys_private/fedora/21/x86_64/
+
+[buildsys_kernel-devel]
+name=Buildsys RPM Fusion nonfree for Fedora 21, kernel-devel
+baseurl=http://buildsys.rpmfusion.org/kernel-devel-pkgs/fedora/21/
+
+"""
10 years
[puppet] Add plague-builder f21 target
by Nicolas Chauvet
commit 90a06e50f9ad7746316a621c41206e6dce61d223
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Dec 13 15:35:06 2014 +0100
Add plague-builder f21 target
.../fedora-21-i386-rpmfusion_free.cfg | 6 ++++++
.../fedora-21-i386-rpmfusion_nonfree.cfg | 6 ++++++
.../fedora-21-x86_64-rpmfusion_free.cfg | 6 ++++++
.../fedora-21-x86_64-rpmfusion_nonfree.cfg | 6 ++++++
4 files changed, 24 insertions(+), 0 deletions(-)
---
diff --git a/modules/plague/files/builder-targets/fedora-21-i386-rpmfusion_free.cfg b/modules/plague/files/builder-targets/fedora-21-i386-rpmfusion_free.cfg
new file mode 100644
index 0000000..fac454f
--- /dev/null
+++ b/modules/plague/files/builder-targets/fedora-21-i386-rpmfusion_free.cfg
@@ -0,0 +1,6 @@
+[General]
+distro = fedora
+target = 21
+basearch = i386
+repo = rpmfusion_free
+mock_config = fedora-21-i386-rpmfusion_free
diff --git a/modules/plague/files/builder-targets/fedora-21-i386-rpmfusion_nonfree.cfg b/modules/plague/files/builder-targets/fedora-21-i386-rpmfusion_nonfree.cfg
new file mode 100644
index 0000000..a2ff567
--- /dev/null
+++ b/modules/plague/files/builder-targets/fedora-21-i386-rpmfusion_nonfree.cfg
@@ -0,0 +1,6 @@
+[General]
+distro = fedora
+target = 21
+basearch = i386
+repo = rpmfusion_nonfree
+mock_config = fedora-21-i386-rpmfusion_nonfree
diff --git a/modules/plague/files/builder-targets/fedora-21-x86_64-rpmfusion_free.cfg b/modules/plague/files/builder-targets/fedora-21-x86_64-rpmfusion_free.cfg
new file mode 100644
index 0000000..6d00b37
--- /dev/null
+++ b/modules/plague/files/builder-targets/fedora-21-x86_64-rpmfusion_free.cfg
@@ -0,0 +1,6 @@
+[General]
+distro = fedora
+target = 21
+basearch = x86_64
+repo = rpmfusion_free
+mock_config = fedora-21-x86_64-rpmfusion_free
diff --git a/modules/plague/files/builder-targets/fedora-21-x86_64-rpmfusion_nonfree.cfg b/modules/plague/files/builder-targets/fedora-21-x86_64-rpmfusion_nonfree.cfg
new file mode 100644
index 0000000..d20de98
--- /dev/null
+++ b/modules/plague/files/builder-targets/fedora-21-x86_64-rpmfusion_nonfree.cfg
@@ -0,0 +1,6 @@
+[General]
+distro = fedora
+target = 21
+basearch = x86_64
+repo = rpmfusion_nonfree
+mock_config = fedora-21-x86_64-rpmfusion_nonfree
10 years
[puppet] hook cvs devel as 21 target in plague-server
by Nicolas Chauvet
commit c4e6ad9bbb5a841d521ff9dc16ba2dc0c3129130
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Dec 13 15:31:40 2014 +0100
hook cvs devel as 21 target in plague-server
.../server-targets/fedora-21-rpmfusion_free.cfg | 22 ++++++++++++++++++++
.../server-targets/fedora-21-rpmfusion_nonfree.cfg | 22 ++++++++++++++++++++
.../fedora-development-rpmfusion_free.cfg | 6 +++-
.../fedora-development-rpmfusion_nonfree.cfg | 6 +++-
4 files changed, 52 insertions(+), 4 deletions(-)
---
diff --git a/modules/plague/files/server-targets/fedora-21-rpmfusion_free.cfg b/modules/plague/files/server-targets/fedora-21-rpmfusion_free.cfg
new file mode 100644
index 0000000..8c33f44
--- /dev/null
+++ b/modules/plague/files/server-targets/fedora-21-rpmfusion_free.cfg
@@ -0,0 +1,22 @@
+[General]
+distro = fedora
+target = 21
+repo = rpmfusion_free
+testing = no
+repo_script = /bin/echo
+
+[Arches]
+base_arches = x86_64 i686
+optional_arches = noarch x86_64 i686
+
+[Aliases]
+cvs_alias = devel
+user_aliases = rawhide-free F-20-free
+
+[Additional Package Arches]
+kernel = i686
+
+[CVS]
+cvs_root = :pserver:anonymous@cvs.rpmfusion.org:/cvs/free
+cvs_rsh =
+
diff --git a/modules/plague/files/server-targets/fedora-21-rpmfusion_nonfree.cfg b/modules/plague/files/server-targets/fedora-21-rpmfusion_nonfree.cfg
new file mode 100644
index 0000000..2b3cc1f
--- /dev/null
+++ b/modules/plague/files/server-targets/fedora-21-rpmfusion_nonfree.cfg
@@ -0,0 +1,22 @@
+[General]
+distro = fedora
+target = 21
+repo = rpmfusion_nonfree
+testing = no
+repo_script = /bin/echo
+
+[Arches]
+base_arches = i686 x86_64
+optional_arches = noarch x86_64 i686
+
+[Aliases]
+cvs_alias = devel
+user_aliases = rawhide-nonfree F-20-nonfree
+
+[Additional Package Arches]
+kernel = i686
+
+[CVS]
+cvs_root = :pserver:anonymous@cvs.rpmfusion.org:/cvs/nonfree
+cvs_rsh =
+
diff --git a/modules/plague/files/server-targets/fedora-development-rpmfusion_free.cfg b/modules/plague/files/server-targets/fedora-development-rpmfusion_free.cfg
index f5226be..ab21089 100644
--- a/modules/plague/files/server-targets/fedora-development-rpmfusion_free.cfg
+++ b/modules/plague/files/server-targets/fedora-development-rpmfusion_free.cfg
@@ -10,8 +10,10 @@ base_arches = i686 x86_64
optional_arches = noarch x86_64 i686
[Aliases]
-cvs_alias = devel
-user_aliases = rawhide-free devel-free development-free
+#cvs_alias = devel-disabled
+cvs_alias = devel-disabled
+#user_aliases = rawhide-free devel-free development-free
+user_aliases = devel-free development-free
[Additional Package Arches]
kernel = i686
diff --git a/modules/plague/files/server-targets/fedora-development-rpmfusion_nonfree.cfg b/modules/plague/files/server-targets/fedora-development-rpmfusion_nonfree.cfg
index e2f52a9..6dbd79a 100644
--- a/modules/plague/files/server-targets/fedora-development-rpmfusion_nonfree.cfg
+++ b/modules/plague/files/server-targets/fedora-development-rpmfusion_nonfree.cfg
@@ -10,8 +10,10 @@ base_arches = i686 x86_64
optional_arches = noarch x86_64 i686
[Aliases]
-cvs_alias = devel
-user_aliases = rawhide-nonfree devel-nonfree development-nonfree
+#cvs_alias = devel
+cvs_alias = devel-disabled
+#user_aliases = rawhide-nonfree devel-nonfree development-nonfree
+user_aliases = devel-nonfree development-nonfree
[Additional Package Arches]
kernel = i686
10 years