cleanup el8 config

13 files changed, 164 insertions, 1265 deletions

diff --git a/el8x.cfg b/el8x.cfg
index c89f1e5..1393639 100644
--- a/el8x.cfg
+++ b/el8x.cfg
@@ -1,124 +1,5 @@
-config_opts['root'] = 'el8x'
-config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
-config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '8'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8x/"
+include('el8x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'el8x'
 config_opts['resultdir'] = "/var/lib/mock/el8x"
-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']=".el8.remi"
-config_opts['macros']['%rhel']="8"
-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['module_enable'] = ['swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-5.0']
-
-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
-modules=1
-module_hotfixes=1
-module_platform_id=platform:el8
-
-# repos
-[rhel-8-baseos]
-name=rhel-8-baseos
-baseurl=file:/mnt/rhel-8-x86_64/BaseOS/
-enabled=1
-
-[rhel-8-appstream]
-name=rhel-8-appstream
-baseurl=file:/mnt/rhel-8-x86_64/AppStream/
-enabled=1
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
-failovermethod=priority
-exclude=epel-rpm-macros
-enabled=1
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/remi/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-modular]
-name=remi modular
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/modular/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv-el8]
-name=remi prive el8
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-bootstrap]
-name=remi bootstrap
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.noarch/
-enabled=1
-metadata_expire=30
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/debug-remi/x86_64/
-enabled=1
-
-[result-el8x]
-name=result-el8x
-baseurl=file:/var/lib/mock/el8x/
-metadata_expire=30
-enabled=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
 
-"""
diff --git a/el8x.tpl b/el8x.tpl
new file mode 100644
index 0000000..45e8298
--- /dev/null
+++ b/el8x.tpl
@@ -0,0 +1,119 @@
+config_opts['target_arch'] = 'x86_64'
+#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
+config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '8'
+config_opts['package_manager'] = 'dnf'
+
+config_opts['plugin_conf']['ccache_enable'] = False
+config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8x/"
+
+config_opts['basedir'] = '/dev/shm/'
+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']=".el8.remi"
+config_opts['macros']['%rhel']="8"
+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['module_enable'] = ['swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-5.0']
+
+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
+modules=1
+module_hotfixes=1
+module_platform_id=platform:el8
+
+# repos
+[rhel-8-baseos]
+name=rhel-8-baseos
+baseurl=file:/mnt/rhel-8-x86_64/BaseOS/
+enabled=1
+
+[rhel-8-appstream]
+name=rhel-8-appstream
+baseurl=file:/mnt/rhel-8-x86_64/AppStream/
+enabled=1
+
+[epel]
+name=epel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
+failovermethod=priority
+exclude=epel-rpm-macros
+enabled=1
+
+[epel-playground]
+name=epel
+mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=playground-epel8&arch=x86_64
+failovermethod=priority
+exclude=epel-rpm-macros
+includepkgs=GeoIP*
+enabled=1
+
+[remi]
+name=remi public
+baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/remi/x86_64/
+enabled=1
+metadata_expire=30
+
+[remi-modular]
+name=remi modular
+baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/modular/x86_64/
+enabled=1
+metadata_expire=30
+
+[remi-priv]
+name=remi prive
+baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
+enabled=1
+metadata_expire=30
+
+[remi-priv-el8]
+name=remi prive el8
+baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
+enabled=1
+metadata_expire=30
+
+[remi-debuginfo]
+name=remi-debuginfo
+baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/debug-remi/x86_64/
+enabled=1
+
+[result-el8x]
+name=result-el8x
+baseurl=file:/var/lib/mock/el8x/
+metadata_expire=30
+enabled=1
+
+[msprod]
+name=msprod
+baseurl=https://packages.microsoft.com/rhel/8/prod/
+enabled=1
+includepkgs=msodbcsql17
+
+"""
diff --git a/el8x72.cfg b/el8x72.cfg
index 8b19bc4..a5a78a0 100644
--- a/el8x72.cfg
+++ b/el8x72.cfg
@@ -1,133 +1,21 @@
-config_opts['root'] = 'el8x72'
-config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
-config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '8'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8x/"
+include('el8x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'el8x72'
 config_opts['resultdir'] = "/var/lib/mock/el8x72"
-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']=".el8.remi"
-config_opts['macros']['%rhel']="8"
-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['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-5.0']
 
-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
-modules=1
-module_hotfixes=1
-module_platform_id=platform:el8
-
-# repos
-[rhel-8-baseos]
-name=rhel-8-baseos
-baseurl=file:/mnt/rhel-8-x86_64/BaseOS/
-exclude=php*x86_64*
-enabled=1
-
-[rhel-8-appstream]
-name=rhel-8-appstream
-baseurl=file:/mnt/rhel-8-x86_64/AppStream/
-exclude=php*x86_64*
-enabled=1
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
-failovermethod=priority
-exclude=epel-rpm-macros
-enabled=1
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/remi/x86_64/
-enabled=1
-metadata_expire=15
-exclude=php*x86_64*
-
-[remi-modular]
-name=remi modular
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/modular/x86_64/
-enabled=1
-metadata_expire=15
-
+config_opts['yum.conf'] += """
 [remi-php72]
 name=remi php72
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/php72/x86_64/
 enabled=0
 metadata_expire=15
 
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=15
-
-[remi-priv-el8]
-name=remi prive el8
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
-enabled=1
-metadata_expire=15
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/debug-remi/x86_64/
-enabled=1
-
-[result-el8x]
-name=result-el8x
-baseurl=file:/var/lib/mock/el8x/
-metadata_expire=15
-enabled=1
-
 [result-el8x72]
 name=result-el8x
 baseurl=file:/var/lib/mock/el8x72/
 metadata_expire=15
 enabled=1
 
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
-includepkgs=msodbcsql17
-
 """
diff --git a/el8x73.cfg b/el8x73.cfg
index 63d6683..ceb1007 100644
--- a/el8x73.cfg
+++ b/el8x73.cfg
@@ -1,133 +1,21 @@
-config_opts['root'] = 'el8x73'
-config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
-config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '8'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8x/"
+include('el8x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'el8x73'
 config_opts['resultdir'] = "/var/lib/mock/el8x73"
-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']=".el8.remi"
-config_opts['macros']['%rhel']="8"
-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['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.3', 'redis:remi-5.0']
 
-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
-modules=1
-module_hotfixes=1
-module_platform_id=platform:el8
-
-# repos
-[rhel-8-baseos]
-name=rhel-8-baseos
-baseurl=file:/mnt/rhel-8-x86_64/BaseOS/
-exclude=php*x86_64*
-enabled=1
-
-[rhel-8-appstream]
-name=rhel-8-appstream
-baseurl=file:/mnt/rhel-8-x86_64/AppStream/
-exclude=php*x86_64*
-enabled=1
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
-failovermethod=priority
-exclude=epel-rpm-macros
-enabled=1
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/remi/x86_64/
-enabled=1
-metadata_expire=15
-exclude=php*x86_64*
-
-[remi-modular]
-name=remi modular
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/modular/x86_64/
-enabled=1
-metadata_expire=15
-
+config_opts['yum.conf'] += """
 [remi-php73]
 name=remi php73
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/php73/x86_64/
 enabled=0
 metadata_expire=15
 
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=15
-
-[remi-priv-el8]
-name=remi prive el8
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
-enabled=1
-metadata_expire=15
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/debug-remi/x86_64/
-enabled=1
-
-[result-el8x]
-name=result-el8x
-baseurl=file:/var/lib/mock/el8x/
-metadata_expire=15
-enabled=1
-
 [result-el8x73]
 name=result-el8x
 baseurl=file:/var/lib/mock/el8x73/
 metadata_expire=15
 enabled=1
 
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
-includepkgs=msodbcsql17
-
 """
diff --git a/el8x74.cfg b/el8x74.cfg
index 3b12a9a..9c6fb89 100644
--- a/el8x74.cfg
+++ b/el8x74.cfg
@@ -1,133 +1,21 @@
-config_opts['root'] = 'el8x74'
-config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz php-devel php-pear'
-config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '8'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8x/"
+include('el8x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'el8x74'
 config_opts['resultdir'] = "/var/lib/mock/el8x74"
-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']=".el8.remi"
-config_opts['macros']['%rhel']="8"
-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['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.4', 'redis:remi-5.0']
 
-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
-modules=1
-module_hotfixes=1
-module_platform_id=platform:el8
-
-# repos
-[rhel-8-baseos]
-name=rhel-8-baseos
-baseurl=file:/mnt/rhel-8-x86_64/BaseOS/
-exclude=php*x86_64*
-enabled=1
-
-[rhel-8-appstream]
-name=rhel-8-appstream
-baseurl=file:/mnt/rhel-8-x86_64/AppStream/
-exclude=php*x86_64*
-enabled=1
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
-failovermethod=priority
-exclude=epel-rpm-macros
-enabled=1
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/remi/x86_64/
-enabled=1
-metadata_expire=15
-exclude=php*x86_64*
-
-[remi-modular]
-name=remi modular
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/modular/x86_64/
-enabled=1
-metadata_expire=15
-
+config_opts['yum.conf'] += """
 [remi-php74]
 name=remi php74
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/php74/x86_64/
 enabled=0
 metadata_expire=15
 
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=15
-
-[remi-priv-el8]
-name=remi prive el8
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
-enabled=1
-metadata_expire=15
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/debug-remi/x86_64/
-enabled=1
-
-[result-el8x]
-name=result-el8x
-baseurl=file:/var/lib/mock/el8x/
-metadata_expire=15
-enabled=1
-
 [result-el8x74]
 name=result-el8x
 baseurl=file:/var/lib/mock/el8x74/
 metadata_expire=15
 enabled=1
 
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
-includepkgs=msodbcsql17
-
 """
diff --git a/el8xp.cfg b/el8xp.cfg
index 43b0224..f383141 100644
--- a/el8xp.cfg
+++ b/el8xp.cfg
@@ -124,7 +124,7 @@ enabled=1
 
 [msprod]
 name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
+baseurl=https://packages.microsoft.com/rhel/8/prod/
 enabled=0
 includepkgs=msodbcsql17
 
diff --git a/el8xr.cfg b/el8xr.cfg
index 9b8ddb0..40d5ac6 100644
--- a/el8xr.cfg
+++ b/el8xr.cfg
@@ -1,130 +1,13 @@
-config_opts['root'] = 'el8x'
-config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
-config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '8'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8x/"
+include('el8x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'el8x'
 config_opts['resultdir'] = "/var/lib/mock/el8x"
-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']=".el8.remi"
-config_opts['macros']['%rhel']="8"
-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['module_enable'] = ['swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-5.0']
-
-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
-modules=1
-module_hotfixes=1
-module_platform_id=platform:el8
 
-# repos
-[rhel-8-baseos]
-name=rhel-8-baseos
-baseurl=file:/mnt/rhel-8-x86_64/BaseOS/
-enabled=1
-
-[rhel-8-appstream]
-name=rhel-8-appstream
-baseurl=file:/mnt/rhel-8-x86_64/AppStream/
-enabled=1
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
-failovermethod=priority
-exclude=epel-rpm-macros
-enabled=1
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/remi/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-modular]
-name=remi modular
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/modular/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv-el8]
-name=remi prive el8
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-bootstrap]
-name=remi bootstrap
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.noarch/
-enabled=1
-metadata_expire=30
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/debug-remi/x86_64/
-enabled=1
-
-[result-el8x]
-name=result-el8x
-baseurl=file:/var/lib/mock/el8x/
-metadata_expire=30
-enabled=1
+config_opts['yum.conf'] += """
 
 [rpmfusion-free-updates]
 name=rpmfusion-free-updates
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-8&arch=x86_64
 enabled=1
 
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
 """
diff --git a/el8xscl56.cfg b/el8xscl56.cfg
index f4b0709..728b129 100644
--- a/el8xscl56.cfg
+++ b/el8xscl56.cfg
@@ -1,118 +1,16 @@
-config_opts['root'] = 'scl56el8x'
-config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php56-build'
-config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '8'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8x/"
+include('el8x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'scl56el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl56el8x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php56-build'
 
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
 
-config_opts['macros']['%_topdir']="/builddir/build"
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
-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']=".el8.remi"
-config_opts['macros']['%rhel']="8"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
 config_opts['macros']['%nophptag']="1"
 
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
-
-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
-modules=1
-module_hotfixes=1
-module_platform_id=platform:el8
-
-# repos
-[rhel-8-baseos]
-name=rhel-8-baseos
-baseurl=file:/mnt/rhel-8-x86_64/BaseOS/
-enabled=1
-
-[rhel-8-appstream]
-name=rhel-8-appstream
-baseurl=file:/mnt/rhel-8-x86_64/AppStream/
-enabled=1
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
-failovermethod=priority
-exclude=epel-rpm-macros
-enabled=1
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/remi/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-modular]
-name=remi modular
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/modular/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv-el8]
-name=remi prive el8
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-bootstrap]
-name=remi bootstrap
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.noarch/
-enabled=0
-metadata_expire=30
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/debug-remi/x86_64/
-enabled=1
+config_opts['yum.conf'] += """
 
 [result-scl56el8x]
 name=result-scl56el8x
@@ -120,10 +18,4 @@ baseurl=file:/var/lib/mock/scl56el8x/
 metadata_expire=30
 enabled=1
 
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
 """
diff --git a/el8xscl70.cfg b/el8xscl70.cfg
index 6f839de..18ff5fe 100644
--- a/el8xscl70.cfg
+++ b/el8xscl70.cfg
@@ -1,118 +1,16 @@
-config_opts['root'] = 'scl70el8x'
-config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php70-build'
-config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '8'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8x/"
+include('el8x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'scl70el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl70el8x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php70-build'
 
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
 
-config_opts['macros']['%_topdir']="/builddir/build"
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
-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']=".el8.remi"
-config_opts['macros']['%rhel']="8"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
 config_opts['macros']['%nophptag']="1"
 
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['module_enable'] = ['php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
-
-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
-modules=1
-module_hotfixes=1
-module_platform_id=platform:el8
-
-# repos
-[rhel-8-baseos]
-name=rhel-8-baseos
-baseurl=file:/mnt/rhel-8-x86_64/BaseOS/
-enabled=1
-
-[rhel-8-appstream]
-name=rhel-8-appstream
-baseurl=file:/mnt/rhel-8-x86_64/AppStream/
-enabled=1
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
-failovermethod=priority
-exclude=epel-rpm-macros
-enabled=1
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/remi/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-modular]
-name=remi modular
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/modular/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv-el8]
-name=remi prive el8
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-bootstrap]
-name=remi bootstrap
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.noarch/
-enabled=1
-metadata_expire=30
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/debug-remi/x86_64/
-enabled=1
+config_opts['yum.conf'] += """
 
 [result-scl70el8x]
 name=result-scl70el8x
@@ -120,10 +18,4 @@ baseurl=file:/var/lib/mock/scl70el8x/
 metadata_expire=30
 enabled=1
 
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
-includepkgs=msodbcsql17
-
 """
diff --git a/el8xscl71.cfg b/el8xscl71.cfg
index 5e11486..03723f4 100644
--- a/el8xscl71.cfg
+++ b/el8xscl71.cfg
@@ -1,118 +1,16 @@
-config_opts['root'] = 'scl71el8x'
-config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build php71-build'
-config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '8'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8x/"
+include('el8x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'scl71el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl71el8x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php71-build'
 
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
 
-config_opts['macros']['%_topdir']="/builddir/build"
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
-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']=".el8.remi"
-config_opts['macros']['%rhel']="8"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
 config_opts['macros']['%nophptag']="1"
 
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['module_enable'] = ['php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
-
-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
-modules=1
-module_hotfixes=1
-module_platform_id=platform:el8
-
-# repos
-[rhel-8-baseos]
-name=rhel-8-baseos
-baseurl=file:/mnt/rhel-8-x86_64/BaseOS/
-enabled=1
-
-[rhel-8-appstream]
-name=rhel-8-appstream
-baseurl=file:/mnt/rhel-8-x86_64/AppStream/
-enabled=1
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
-failovermethod=priority
-exclude=epel-rpm-macros
-enabled=1
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/remi/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-modular]
-name=remi modular
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/modular/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv-el8]
-name=remi prive el8
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-bootstrap]
-name=remi bootstrap
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.noarch/
-enabled=0
-metadata_expire=30
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/debug-remi/x86_64/
-enabled=1
+config_opts['yum.conf'] += """
 
 [result-scl71el8x]
 name=result-scl71el8x
@@ -120,10 +18,4 @@ baseurl=file:/var/lib/mock/scl71el8x/
 metadata_expire=30
 enabled=1
 
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
-includepkgs=msodbcsql17
-
 """
diff --git a/el8xscl72.cfg b/el8xscl72.cfg
index 2ebd3cb..c60d867 100644
--- a/el8xscl72.cfg
+++ b/el8xscl72.cfg
@@ -1,118 +1,16 @@
-config_opts['root'] = 'scl72el8x'
-config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php72-build php72-php-devel php72-php-pear'
-config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '8'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8x/"
+include('el8x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'scl72el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl72el8x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php72-build php72-php-devel php72-php-pear'
 
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
 
-config_opts['macros']['%_topdir']="/builddir/build"
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
-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']=".el8.remi"
-config_opts['macros']['%rhel']="8"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
 config_opts['macros']['%nophptag']="1"
 
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['module_enable'] = ['php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
-
-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
-modules=1
-module_hotfixes=1
-module_platform_id=platform:el8
-
-# repos
-[rhel-8-baseos]
-name=rhel-8-baseos
-baseurl=file:/mnt/rhel-8-x86_64/BaseOS/
-enabled=1
-
-[rhel-8-appstream]
-name=rhel-8-appstream
-baseurl=file:/mnt/rhel-8-x86_64/AppStream/
-enabled=1
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
-failovermethod=priority
-exclude=epel-rpm-macros
-enabled=1
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/remi/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-modular]
-name=remi modular
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/modular/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv-el8]
-name=remi prive el8
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-bootstrap]
-name=remi bootstrap
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.noarch/
-enabled=1
-metadata_expire=30
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/debug-remi/x86_64/
-enabled=1
+config_opts['yum.conf'] += """
 
 [result-scl72el8x]
 name=result-scl72el8x
@@ -120,10 +18,4 @@ baseurl=file:/var/lib/mock/scl72el8x/
 metadata_expire=30
 enabled=1
 
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
-includepkgs=msodbcsql17
-
 """
diff --git a/el8xscl73.cfg b/el8xscl73.cfg
index ce92117..050ff68 100644
--- a/el8xscl73.cfg
+++ b/el8xscl73.cfg
@@ -1,118 +1,16 @@
-config_opts['root'] = 'scl73el8x'
-config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz nss crypto-policies scl-utils-build php73-build php73-php-devel php73-php-pear'
-config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '8'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8x/"
+include('el8x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'scl73el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl73el8x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php73-build php73-php-devel php73-php-pear'
 
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
 
-config_opts['macros']['%_topdir']="/builddir/build"
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
-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']=".el8.remi"
-config_opts['macros']['%rhel']="8"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
 config_opts['macros']['%nophptag']="1"
 
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['module_enable'] = ['php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
-
-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
-modules=1
-module_hotfixes=1
-module_platform_id=platform:el8
-
-# repos
-[rhel-8-baseos]
-name=rhel-8-baseos
-baseurl=file:/mnt/rhel-8-x86_64/BaseOS/
-enabled=1
-
-[rhel-8-appstream]
-name=rhel-8-appstream
-baseurl=file:/mnt/rhel-8-x86_64/AppStream/
-enabled=1
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
-failovermethod=priority
-exclude=epel-rpm-macros
-enabled=1
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/remi/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-modular]
-name=remi modular
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/modular/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv-el8]
-name=remi prive el8
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-bootstrap]
-name=remi bootstrap
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.noarch/
-enabled=1
-metadata_expire=30
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/debug-remi/x86_64/
-enabled=1
+config_opts['yum.conf'] += """
 
 [result-scl73el8x]
 name=result-scl73el8x
@@ -120,10 +18,4 @@ baseurl=file:/var/lib/mock/scl73el8x/
 metadata_expire=30
 enabled=1
 
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
-includepkgs=msodbcsql17
-
 """
diff --git a/el8xscl74.cfg b/el8xscl74.cfg
index d313ec7..0c98260 100644
--- a/el8xscl74.cfg
+++ b/el8xscl74.cfg
@@ -1,118 +1,16 @@
-config_opts['root'] = 'scl74el8x'
-config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz nss crypto-policies scl-utils-build php74-build php74-php-devel php74-php-pear'
-config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '8'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8x/"
+include('el8x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'scl74el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl74el8x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php74-build php74-php-devel php74-php-pear'
 
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
 
-config_opts['macros']['%_topdir']="/builddir/build"
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
-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']=".el8.remi"
-config_opts['macros']['%rhel']="8"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
 config_opts['macros']['%nophptag']="1"
 
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['module_enable'] = ['php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-5.0']
-
-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
-modules=1
-module_hotfixes=1
-module_platform_id=platform:el8
-
-# repos
-[rhel-8-baseos]
-name=rhel-8-baseos
-baseurl=file:/mnt/rhel-8-x86_64/BaseOS/
-enabled=1
-
-[rhel-8-appstream]
-name=rhel-8-appstream
-baseurl=file:/mnt/rhel-8-x86_64/AppStream/
-enabled=1
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
-failovermethod=priority
-exclude=epel-rpm-macros
-enabled=1
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/remi/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-modular]
-name=remi modular
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/modular/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv-el8]
-name=remi prive el8
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-bootstrap]
-name=remi bootstrap
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.noarch/
-enabled=1
-metadata_expire=30
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/debug-remi/x86_64/
-enabled=1
+config_opts['yum.conf'] += """
 
 [result-scl74el8x]
 name=result-scl74el8x
@@ -120,10 +18,4 @@ baseurl=file:/var/lib/mock/scl74el8x/
 metadata_expire=30
 enabled=1
 
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
-includepkgs=msodbcsql17
-
 """