cleanup f31 config

11 files changed, 157 insertions, 1144 deletions

diff --git a/fc31x.cfg b/fc31x.cfg
index bd29781..7e0cdd6 100644
--- a/fc31x.cfg
+++ b/fc31x.cfg
@@ -1,135 +1,2 @@
-config_opts['root'] = 'fc31x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['dist'] = 'fc31'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '31'
-config_opts['package_manager'] = 'dnf'
+include('fc31x.tpl')
 
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc31x/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/fc31x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi Collet"
-config_opts['macros']['%packager']="https://blog.remirepo.net/"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".fc31.remi"
-config_opts['macros']['%fedora']="31"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-
-# repos
-
-[fedora]
-name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-failovermethod=priority
-metadata_expire=80000
-##mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-31&arch=x86_64
-#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/31/Everything/x86_64/os/
-#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/31/Everything/x86_64/os/
-
-[updates]
-name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
-#	http://mirrors.ircam.fr/pub/fedora/linux/updates/31/x86_64/
-#	http://fr2.rpmfind.net/linux/fedora/updates/31/x86_64/
-enabled=1
-	
-[updates-testing]
-name=updates-testing
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/31/x86_64/
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/remi/x86_64/
-enabled=1
-metadata_expire=10
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=10
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/debug-remi/x86_64/
-enabled=1
-
-[remi-dev]
-name=remi dev
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/devs/x86_64/
-enabled=0
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree-updates]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-31&arch=x86_64
-enabled=0
-
-[result-fc31x]
-name=result-fc31x
-baseurl=file:/var/lib/mock/fc31x/
-metadata_expire=10
-enabled=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
-
-"""
diff --git a/fc31x.tpl b/fc31x.tpl
new file mode 100644
index 0000000..a180fbd
--- /dev/null
+++ b/fc31x.tpl
@@ -0,0 +1,105 @@
+config_opts['root'] = 'fc31x'
+config_opts['target_arch'] = 'x86_64'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
+config_opts['dist'] = 'fc31'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '31'
+config_opts['package_manager'] = 'dnf'
+
+config_opts['plugin_conf']['ccache_enable'] = True
+config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc31x/"
+
+config_opts['basedir'] = '/dev/shm/'
+config_opts['resultdir'] = "/var/lib/mock/fc31x"
+config_opts['cleanup_on_success'] = True
+config_opts['cleanup_on_failure'] = False
+
+config_opts['createrepo_on_rpms'] = True
+config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
+
+config_opts['macros']['%_topdir']="/builddir/build"
+config_opts['macros']['%_smp_mflags']="-j10"
+config_opts['macros']['%vendor']="Remi Collet"
+config_opts['macros']['%packager']="https://blog.remirepo.net/"
+config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
+config_opts['macros']['%dist']=".fc31.remi"
+config_opts['macros']['%fedora']="31"
+config_opts['macros']['%_with_ibase']="1"
+config_opts['macros']['%_with_oci8']="1"
+config_opts['macros']['%runselftest']="1"
+
+config_opts['environment']['ACCEPT_EULA'] = 'Y'
+
+config_opts['yum.conf'] = """
+[main]
+keepcache=1
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+metadata_expire=80000
+fastestmirror=1
+max_parallel_downloads=6
+
+# repos
+
+[fedora]
+name=fedora
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+failovermethod=priority
+metadata_expire=80000
+##mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-31&arch=x86_64
+#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/31/Everything/x86_64/os/
+#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/31/Everything/x86_64/os/
+
+[updates]
+name=updates
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
+#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
+#	http://mirrors.ircam.fr/pub/fedora/linux/updates/31/x86_64/
+#	http://fr2.rpmfind.net/linux/fedora/updates/31/x86_64/
+enabled=1
+	
+[updates-testing]
+name=updates-testing
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+failovermethod=priority
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
+#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/31/x86_64/
+enabled=0
+
+[remi]
+name=remi public
+baseurl=file:/home/rpmbuild/site/rpms/fedora/31/remi/x86_64/
+enabled=1
+metadata_expire=10
+
+[remi-priv]
+name=remi prive
+baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
+enabled=1
+metadata_expire=10
+
+[remi-debuginfo]
+name=remi-debuginfo
+baseurl=file:/home/rpmbuild/site/rpms/fedora/31/debug-remi/x86_64/
+enabled=1
+
+[result-fc31x]
+name=result-fc31x
+baseurl=file:/var/lib/mock/fc31x/
+metadata_expire=10
+enabled=1
+
+[msprod]
+name=msprod
+baseurl=https://packages.microsoft.com/rhel/7/prod/
+enabled=1
+
+"""
diff --git a/fc31x74.cfg b/fc31x74.cfg
index 86087ba..b76268e 100644
--- a/fc31x74.cfg
+++ b/fc31x74.cfg
@@ -1,141 +1,11 @@
-config_opts['root'] = 'fc31x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
-config_opts['dist'] = 'fc31'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '31'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc31x/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/fc31x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi Collet"
-config_opts['macros']['%packager']="https://blog.remirepo.net/"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".fc31.remi"
-config_opts['macros']['%fedora']="31"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-
-# repos
-
-[fedora]
-name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-failovermethod=priority
-metadata_expire=80000
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-31&arch=x86_64
-#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/31/Everything/x86_64/os/
-#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/31/Everything/x86_64/os/
-
-[updates-released]
-name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/31/x86_64/
-enabled=1
-	
-[updates-testing]
-name=updates-testing
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f31&arch=x86_64
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/31/x86_64/
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/remi/x86_64/
-enabled=1
-exclude=php-pecl-*
-metadata_expire=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=1
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/test/x86_64/
-enabled=0
+include('fc31x.tpl')
 
+config_opts['yum.conf'] += """
 [remi-php74]
 name=remi php74
 baseurl=file:/home/rpmbuild/site/rpms/fedora/31/php74/x86_64/
 enabled=1
 metadata_expire=1
 
-[remi-debuginfo-php74]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/debug-php74/x86_64/
-enabled=1
-
-[remi-dev]
-name=remi dev
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/devs/x86_64/
-enabled=0
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree-updates]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-31&arch=x86_64
-enabled=0
-
-[result]
-name=result
-baseurl=file:/var/lib/mock/fc31x/
-enabled=1
-metadata_expire=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
-
 """
 
diff --git a/fc31xd.cfg b/fc31xd.cfg
new file mode 100644
index 0000000..3277311
--- /dev/null
+++ b/fc31xd.cfg
@@ -0,0 +1,10 @@
+include('fc31x.tpl')
+
+config_opts['yum.conf'] += """
+[remi-dev]
+name=remi dev
+baseurl=file:/home/rpmbuild/site/rpms/fedora/31/devs/x86_64/
+enabled=1
+metadata_expire=10
+
+"""
diff --git a/fc31xr.cfg b/fc31xr.cfg
index 1ba14ed..10d60c2 100644
--- a/fc31xr.cfg
+++ b/fc31xr.cfg
@@ -1,107 +1,6 @@
-config_opts['root'] = 'fc31x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['dist'] = 'fc31'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '31'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc31x/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/fc31x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi Collet"
-config_opts['macros']['%packager']="https://blog.remirepo.net/"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".fc31.remi"
-config_opts['macros']['%fedora']="31"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%_with_rpmfusion']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-
-# repos
-
-[fedora]
-name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-failovermethod=priority
-metadata_expire=80000
-##mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-31&arch=x86_64
-#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/31/Everything/x86_64/os/
-#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/31/Everything/x86_64/os/
-
-[updates]
-name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
-#	http://mirrors.ircam.fr/pub/fedora/linux/updates/31/x86_64/
-#	http://fr2.rpmfind.net/linux/fedora/updates/31/x86_64/
-enabled=1
-	
-[updates-testing]
-name=updates-testing
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/31/x86_64/
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/remi/x86_64/
-enabled=1
-metadata_expire=10
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=10
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/debug-remi/x86_64/
-enabled=1
-
-[remi-dev]
-name=remi dev
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/devs/x86_64/
-enabled=0
+include('fc31x.tpl')
 
+config_opts['yum.conf'] += """
 [rpmfusion-free]
 name=rpmfusion-free
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-31&arch=x86_64
@@ -110,7 +9,7 @@ enabled=1
 [rpmfusion-free-updates]
 name=rpmfusion-free-updates
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-31&arch=x86_64
-enabled=0
+enabled=1
 
 [rpmfusion-nonfree]
 name=rpmfusion-nonfree
@@ -122,15 +21,4 @@ name=rpmfusion-nonfree
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-31&arch=x86_64
 enabled=0
 
-[result-fc31x]
-name=result-fc31x
-baseurl=file:/var/lib/mock/fc31x/
-metadata_expire=10
-enabled=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
-
 """
diff --git a/fc31xscl56.cfg b/fc31xscl56.cfg
index 4b1b79a..7e398fa 100644
--- a/fc31xscl56.cfg
+++ b/fc31xscl56.cfg
@@ -1,137 +1,23 @@
-config_opts['root'] = 'scl56fc31x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php56-build'
-config_opts['dist'] = 'fc31'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '31'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc31x/"
+include('fc31x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'scl56fc31x'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php56-build php56-php-devel php56-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl56fc31x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi Collet"
-config_opts['macros']['%packager']="https://blog.remirepo.net/"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".fc31.remi"
-config_opts['macros']['%fedora']="31"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
+
 config_opts['macros']['%nophptag']="1"
 # Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
 #config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485290
+# workaround for https://bugzilla.redhat.com/1485310
 config_opts['macros']['%_build_id_links']='none'
 
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-
-# repos
-
-[fedora]
-name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-failovermethod=priority
-metadata_expire=800000
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-31&arch=x86_64
-#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/31/Everything/x86_64/os/
-#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/31/Everything/x86_64/os/
-
-[updates-released]
-name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
-#	http://mirrors.ircam.fr/pub/fedora/linux/updates/31/x86_64/
-#	http://fr2.rpmfind.net/linux/fedora/updates/31/x86_64/
-enabled=1
-	
-[updates-testing]
-name=updates-testing
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/31/x86_64/
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/remi/x86_64/
-enabled=1
-metadata_expire=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=1
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/test/x86_64/
-enabled=0
-
-[remi-dev]
-name=remi dev
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/devs/x86_64/
-enabled=0
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree-updates]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-31&arch=x86_64
-enabled=0
-
+config_opts['yum.conf'] += """
 [result-scl56fc31x]
-name=result
+name=result-scl56fc31x
 baseurl=file:/var/lib/mock/scl56fc31x/
 enabled=1
-metadata_expire=1
-
-[result-fc31x]
-name=result-fc31x
-baseurl=file:/var/lib/mock/fc31x/
-enabled=1
-metadata_expire=1
+metadata_expire=10
 
 """
diff --git a/fc31xscl70.cfg b/fc31xscl70.cfg
index 09a3295..6697cfa 100644
--- a/fc31xscl70.cfg
+++ b/fc31xscl70.cfg
@@ -1,145 +1,23 @@
-config_opts['root'] = 'scl70fc31x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php70-build'
-config_opts['dist'] = 'fc31'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '31'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc31x/"
+include('fc31x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'scl70fc31x'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php70-build php70-php-devel php70-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl70fc31x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi Collet"
-config_opts['macros']['%packager']="https://blog.remirepo.net/"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".fc31.remi"
-config_opts['macros']['%fedora']="31"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
+
 config_opts['macros']['%nophptag']="1"
 # Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
 #config_opts['macros']['%_debugsource_packages']="%nil"
 # workaround for https://bugzilla.redhat.com/1485310
 config_opts['macros']['%_build_id_links']='none'
 
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-
-# repos
-
-[fedora]
-name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-failovermethod=priority
-metadata_expire=800000
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-31&arch=x86_64
-#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/31/Everything/x86_64/os/
-#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/31/Everything/x86_64/os/
-exclude=*.i686
-
-[updates-released]
-name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
-#	http://mirrors.ircam.fr/pub/fedora/linux/updates/31/x86_64/
-#	http://fr2.rpmfind.net/linux/fedora/updates/31/x86_64/
-enabled=1
-exclude=*.i686
-
-[updates-testing]
-name=updates-testing
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f31&arch=x86_64
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/31/x86_64/
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/remi/x86_64/
-enabled=1
-metadata_expire=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=1
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/test/x86_64/
-enabled=0
-
-[remi-dev]
-name=remi dev
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/devs/x86_64/
-enabled=0
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree-updates]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-31&arch=x86_64
-enabled=0
-
+config_opts['yum.conf'] += """
 [result-scl70fc31x]
 name=result-scl70fc31x
 baseurl=file:/var/lib/mock/scl70fc31x/
 enabled=1
-metadata_expire=1
-
-[result-fc31x]
-name=result-fc31x
-baseurl=file:/var/lib/mock/fc31x/
-enabled=1
-metadata_expire=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
+metadata_expire=10
 
 """
diff --git a/fc31xscl71.cfg b/fc31xscl71.cfg
index cd48d9e..6efd0a8 100644
--- a/fc31xscl71.cfg
+++ b/fc31xscl71.cfg
@@ -1,145 +1,23 @@
-config_opts['root'] = 'scl71fc31x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php71-build'
-config_opts['dist'] = 'fc31'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '31'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc31x/"
+include('fc31x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'scl71fc31x'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php71-build php71-php-devel php71-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl71fc31x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi Collet"
-config_opts['macros']['%packager']="https://blog.remirepo.net/"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".fc31.remi"
-config_opts['macros']['%fedora']="31"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
+
 config_opts['macros']['%nophptag']="1"
 # Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
 #config_opts['macros']['%_debugsource_packages']="%nil"
 # workaround for https://bugzilla.redhat.com/1485310
 config_opts['macros']['%_build_id_links']='none'
 
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-
-# repos
-
-[fedora]
-name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-failovermethod=priority
-metadata_expire=800000
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-31&arch=x86_64
-#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/31/Everything/x86_64/os/
-#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/31/Everything/x86_64/os/
-exclude=*.i686
-
-[updates-released]
-name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
-#	http://mirrors.ircam.fr/pub/fedora/linux/updates/31/x86_64/
-#	http://fr2.rpmfind.net/linux/fedora/updates/31/x86_64/
-enabled=1
-exclude=*.i686
-
-[updates-testing]
-name=updates-testing
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/31/x86_64/
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/remi/x86_64/
-enabled=1
-metadata_expire=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=1
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/test/x86_64/
-enabled=0
-
-[remi-dev]
-name=remi dev
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/devs/x86_64/
-enabled=0
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree-updates]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-31&arch=x86_64
-enabled=0
-
+config_opts['yum.conf'] += """
 [result-scl71fc31x]
 name=result-scl71fc31x
 baseurl=file:/var/lib/mock/scl71fc31x/
 enabled=1
-metadata_expire=1
-
-[result-fc31x]
-name=result-fc31x
-baseurl=file:/var/lib/mock/fc31x/
-enabled=1
-metadata_expire=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
+metadata_expire=10
 
 """
diff --git a/fc31xscl72.cfg b/fc31xscl72.cfg
index 50f538c..662acf6 100644
--- a/fc31xscl72.cfg
+++ b/fc31xscl72.cfg
@@ -1,146 +1,23 @@
+include('fc31x.tpl')
+
 config_opts['root'] = 'scl72fc31x'
-config_opts['target_arch'] = 'x86_64'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php72-build php72-php-devel php72-php-pear'
-config_opts['dist'] = 'fc31'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '31'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc31x/"
-
-config_opts['basedir'] = '/dev/shm/'
 config_opts['resultdir'] = "/var/lib/mock/scl72fc31x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi Collet"
-config_opts['macros']['%packager']="https://blog.remirepo.net/"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".fc31.remi"
-config_opts['macros']['%fedora']="31"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
+
 config_opts['macros']['%nophptag']="1"
 # Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
 #config_opts['macros']['%_debugsource_packages']="%nil"
 # workaround for https://bugzilla.redhat.com/1485310
 config_opts['macros']['%_build_id_links']='none'
 
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-
-# repos
-
-[fedora]
-name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-failovermethod=priority
-metadata_expire=800000
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-31&arch=x86_64
-#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/31/Everything/x86_64/os/
-#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/31/Everything/x86_64/os/
-exclude=*.i686
-
-[updates-released]
-name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
-#	http://mirrors.ircam.fr/pub/fedora/linux/updates/31/x86_64/
-#	http://fr2.rpmfind.net/linux/fedora/updates/31/x86_64/
-enabled=1
-exclude=*.i686
-
-[updates-testing]
-name=updates-testing
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/31/x86_64/
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/remi/x86_64/
-enabled=1
-metadata_expire=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=1
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/test/x86_64/
-enabled=0
-metadata_expire=1
-
-[remi-dev]
-name=remi dev
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/devs/x86_64/
-enabled=0
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree-updates]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-31&arch=x86_64
-enabled=0
-
+config_opts['yum.conf'] += """
 [result-scl72fc31x]
 name=result-scl72fc31x
 baseurl=file:/var/lib/mock/scl72fc31x/
 enabled=1
-metadata_expire=1
-
-[result-fc31x]
-name=result-fc31x
-baseurl=file:/var/lib/mock/fc31x/
-enabled=1
-metadata_expire=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
+metadata_expire=10
 
 """
diff --git a/fc31xscl73.cfg b/fc31xscl73.cfg
index a7b8b23..81f2d0f 100644
--- a/fc31xscl73.cfg
+++ b/fc31xscl73.cfg
@@ -1,146 +1,23 @@
-config_opts['root'] = 'scl73fc31x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php73-build php73-php-devel php73-php-pear'
-config_opts['dist'] = 'fc31'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '31'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc31x/"
+include('fc31x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'scl73fc31x'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php73-build php73-php-devel php73-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl73fc31x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi Collet"
-config_opts['macros']['%packager']="https://blog.remirepo.net/"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".fc31.remi"
-config_opts['macros']['%fedora']="31"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
+
 config_opts['macros']['%nophptag']="1"
 # Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
 #config_opts['macros']['%_debugsource_packages']="%nil"
 # workaround for https://bugzilla.redhat.com/1485310
 config_opts['macros']['%_build_id_links']='none'
 
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-
-# repos
-
-[fedora]
-name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-failovermethod=priority
-metadata_expire=800000
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-31&arch=x86_64
-#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/31/Everything/x86_64/os/
-#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/31/Everything/x86_64/os/
-exclude=*.i686
-
-[updates-released]
-name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
-#	http://mirrors.ircam.fr/pub/fedora/linux/updates/31/x86_64/
-#	http://fr2.rpmfind.net/linux/fedora/updates/31/x86_64/
-enabled=1
-exclude=*.i686
-
-[updates-testing]
-name=updates-testing
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/31/x86_64/
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/remi/x86_64/
-enabled=1
-metadata_expire=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=1
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/test/x86_64/
-enabled=0
-metadata_expire=1
-
-[remi-dev]
-name=remi dev
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/devs/x86_64/
-enabled=0
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree-updates]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-31&arch=x86_64
-enabled=0
-
+config_opts['yum.conf'] += """
 [result-scl73fc31x]
 name=result-scl73fc31x
 baseurl=file:/var/lib/mock/scl73fc31x/
 enabled=1
-metadata_expire=1
-
-[result-fc31x]
-name=result-fc31x
-baseurl=file:/var/lib/mock/fc31x/
-enabled=1
-metadata_expire=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
+metadata_expire=10
 
 """
diff --git a/fc31xscl74.cfg b/fc31xscl74.cfg
index 7b40d7b..d587d79 100644
--- a/fc31xscl74.cfg
+++ b/fc31xscl74.cfg
@@ -1,146 +1,23 @@
+include('fc31x.tpl')
+
 config_opts['root'] = 'scl74fc31x'
-config_opts['target_arch'] = 'x86_64'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php74-build php74-php-devel php74-php-pear'
-config_opts['dist'] = 'fc31'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '31'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc31x/"
-
-config_opts['basedir'] = '/dev/shm/'
 config_opts['resultdir'] = "/var/lib/mock/scl74fc31x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi Collet"
-config_opts['macros']['%packager']="https://blog.remirepo.net/"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".fc31.remi"
-config_opts['macros']['%fedora']="31"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
+
 config_opts['macros']['%nophptag']="1"
 # Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
 #config_opts['macros']['%_debugsource_packages']="%nil"
 # workaround for https://bugzilla.redhat.com/1485310
 config_opts['macros']['%_build_id_links']='none'
 
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-
-# repos
-
-[fedora]
-name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-failovermethod=priority
-metadata_expire=800000
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-31&arch=x86_64
-#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/31/Everything/x86_64/os/
-#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/31/Everything/x86_64/os/
-exclude=*.i686
-
-[updates-released]
-name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
-#	http://mirrors.ircam.fr/pub/fedora/linux/updates/31/x86_64/
-#	http://fr2.rpmfind.net/linux/fedora/updates/31/x86_64/
-enabled=1
-exclude=*.i686
-
-[updates-testing]
-name=updates-testing
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/31/x86_64/
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/remi/x86_64/
-enabled=1
-metadata_expire=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=1
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/test/x86_64/
-enabled=0
-metadata_expire=1
-
-[remi-dev]
-name=remi dev
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/devs/x86_64/
-enabled=0
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-31&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree-updates]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-31&arch=x86_64
-enabled=0
-
+config_opts['yum.conf'] += """
 [result-scl74fc31x]
 name=result-scl74fc31x
 baseurl=file:/var/lib/mock/scl74fc31x/
 enabled=1
-metadata_expire=1
-
-[result-fc31x]
-name=result-fc31x
-baseurl=file:/var/lib/mock/fc31x/
-enabled=1
-metadata_expire=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
+metadata_expire=10
 
 """