--- rpms/smeserver-extrarepositories/contribs10/smeserver-extrarepositories.spec	2020/10/27 11:30:16	1.2
+++ rpms/smeserver-extrarepositories/contribs10/smeserver-extrarepositories.spec	2024/02/20 21:31:15	1.29
@@ -1,6 +1,6 @@
 %define name smeserver-extrarepositories
 %define version 0.1
-%define release 22
+%define release 44
 Summary: easy configuration of extra yum repo
 Name: %{name}
 Version: %{version}
@@ -11,13 +11,96 @@ Group: SMEserver/addon
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
-Requires: e-smith-release >= 9.0
+Requires: e-smith-release >= 10.0
 AutoReqProv: no
+Source0: https://raw.githubusercontent.com/ONLYOFFICE/repo/master/centos/RPM-GPG-KEY-ONLYOFFICE
+Source1: https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL7
 
 %description
 Provides configuration for external yum repository comaptible with Koozali SME Server.
 
 %changelog
+* Tue Feb 20 2024 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-44.sme
+- update pgsql gpg keys and add new versions [SME: 12473]
+
+* Fri Oct 27 2023 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-43.sme
+- add new elastic repos [SME: 12422]
+- add wandisco distribution of git [SME: 12345]
+- add priority to centos sclo [SME: 12278]
+- add lemonldap 1.4 1.9 and 2.0 on top of stable (2.0) [SME: 12143]
+
+* Mon Sep 04 2023 John Crisp <jcrisp@safeandsoundit.co.uk> 0.1-42.sme
+- Fix the error in the spec file [SME: 12389]
+
+* Wed Jul 26 2023 John Crisp <jcrisp@safeandsoundit.co.uk> 0.1-41.sme
+- fix issues with libreswan repo [SME: 12389]
+- Remove old mongodb repos prior to 4.0
+
+* Wed Jun 22 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-40.sme
+- add mongodb repos [SME: 11905]
+- add onlyoffice repo [SME: 12078]
+- add nginx repo [SME: 12079]
+
+* Sat May 28 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-39.sme
+- fix typo in pgsql url 
+
+* Thu Mar 10 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-38.sme
+- add docker-ce repo [SME: 11894]
+
+* Wed Mar 09 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-37.sme
+- add collaboraoffice repo [SME: 11888]
+
+* Thu Feb 24 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-36.sme
+- add Copr repo for fusioninventory-agent owned by trasher [SME: 11751]
+- fix update event for sclo [SME: 11876]
+
+* Mon Nov 29 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-35.sme
+- fix node repos
+
+* Tue Nov 09 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-34.sme
+- add asterisk [SME: 11512]
+- add lemonldap [SME: 11740]
+- add bareos [SME: 11741]
+- add zabbix repo up to 55 and add scl sub repos [SME: 11744]
+
+* Tue Jul 06 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-33.sme
+- add migrate fragment for pwauth in epel [SME: 11639]
+
+* Wed Jun 30 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.1-32.sme
+- Requires e-smith >= 10
+- exclude pwauh from EPEL [SME: 11639]
+
+* Sun May 02 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.1-31.sme
+- add perl-JSON to openfusion [SME: 11579]
+
+* Thu Mar 25 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-30.sme
+- fix zabbix key
+- fix update event for packages with multiple repo 
+
+* Thu Mar 25 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-29.sme
+- add new zabbix version
+
+* Mon Mar 22 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-28.sme
+- add extra packages from openfusion [SME: 11223] 
+- fix wrong event for remi-unsafe  [SME: 11181] 
+- add repo for postgsql 
+- remove digium asterisk repo for SME10  [SME: 11482] 
+- remove geekery repo [SME: 11483] 
+
+* Mon Dec 21 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.1-27.sme
+- Add perl-Disk-Free and perl-Type-Tiny to Migrate script [SME: 11024]
+
+* Mon Dec 21 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.1-26.sme
+- Add perl-Disk-Free for smeserver-affa [SME: 11024]
+
+* Wed Dec 02 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.1-25.sme
+- add extar packages from Openfusion for NextCloud [SME: 11223]
+- perl-Array-Compare perl-Type-Tiny perl-Exporter-Tiny
+
+* Tue Nov 17 2020 Jean-Philipe Pialasse <tests@pialasse.com> 0.1-24.sme
+- add event on update to avoid reboot [SME: 11181]
+- remove remi-safe as it is now in core rpm [SME: 11182]
+
 * Tue Oct 27 2020 Brian Read <brianr@bjsystems.co.uk> 0.1-22.sme
 - Initial import to SME10 tree [SME: 11057]
 
@@ -92,6 +175,8 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/rpm-g
 # if needing to add a gpg key
 #cp %source0 $RPM_BUILD_ROOT/usr/share/rpm-gpg-keys/ 
 #/usr/share/rpm-gpg-keys/RPM-GPG-KEY-${REPO['reponame']}
+cp %SOURCE0  $RPM_BUILD_ROOT/usr/share/rpm-gpg-keys/
+cp %SOURCE1  $RPM_BUILD_ROOT/usr/share/rpm-gpg-keys/PGDG-RPM-GPG-KEY-RHEL7-pgsql
 
 # if needing to migrate something :
 #mkdir -p $RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate
@@ -114,6 +199,10 @@ echo "${REPO['fullreponame']}" > $RPM_BU
 echo "${REPO['Visible']}" > $RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/defaults/${REPO['reponame']}/Visible
 echo "${REPO['status']}"  > $RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/defaults/${REPO['reponame']}/status
 echo "repository" > $RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/defaults/${REPO['reponame']}/type
+
+mkdir -p $RPM_BUILD_ROOT/etc/e-smith/events/smeserver-extrarepositories-${REPO['pkgname']}-update/templates2expand/etc/yum.smerepos.d/
+touch $RPM_BUILD_ROOT/etc/e-smith/events/smeserver-extrarepositories-${REPO['pkgname']}-update/templates2expand/etc/yum.smerepos.d/sme-base.repo
+
 [[ "${REPO['BaseURL']}" != '' ]]  &&       echo "${REPO['BaseURL']}" >\
                 $RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/defaults/${REPO['reponame']}/BaseURL
 [[ "${REPO['GPGKey']}" != '' ]]  &&       echo "${REPO['GPGKey']}" >\
@@ -124,117 +213,141 @@ echo "repository" > $RPM_BUILD_ROOT/etc/
                 $RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/defaults/${REPO['reponame']}/Exclude
 [[ "${REPO['IncludePkgs']}" != '' ]]  &&       echo "${REPO['IncludePkgs']}"   >\
                 $RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/defaults/${REPO['reponame']}/IncludePkgs
+[[ "${REPO['Priority']}" != '' ]]  &&       echo "${REPO['Priority']}"   >\
+                $RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/defaults/${REPO['reponame']}/Priority
 return 0
 }
 
 
-
-######################
 #####################
-# asterisk 13 LTS
 #####################
+# asterisk
 #####################
-REPO['reponame']='asterisk-13'
-REPO['fullreponame']='Asterisk-13 - EL'
-REPO['EnableGroups']='yes'
-REPO['GPGCheck']='no'
-REPO['Visible']='no'
+#####################
+for elasver  in "13" "16"  '17' '18' ; do
+REPO['reponame']="asterisk-$elasver"
+REPO['pkgname']='asterisk'
+REPO['fullreponame']="Asterisk $elasver (LTS) Packages @ tucny.com"
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
-REPO['BaseURL']='http://packages.asterisk.org/centos/$releasever/asterisk-13/$basearch/'
-REPO['MirrorList']=''
-REPO['GPGKey']=''
+REPO['BaseURL']=""#https://ast.tucny.com/repo/asterisk-$elasver/el\$releasever/\$basearch/
+REPO['MirrorList']="https://ast.tucny.com/mirrorlist.php?release=\$releasever&arch=\$basearch&repo=asterisk-$elasver"
+REPO['GPGCheck']='yes'
+REPO['GPGKey']="https://ast.tucny.com/repo/RPM-GPG-KEY-dtucny"
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
+done
 
-######################
-#####################
-# asterisk current
-#####################
-#####################
-REPO['reponame']='asterisk-current'
-REPO['fullreponame']='Asterisk-current - EL'
-REPO['EnableGroups']='yes'
-REPO['GPGCheck']='no'
+REPO['reponame']='asterisk-common'
+REPO['pkgname']='asterisk'
+REPO['fullreponame']='Asterisk Common Requirement Packages @ tucny.com'
+REPO['EnableGroups']='no'
 REPO['Visible']='no'
 REPO['status']='disabled'
-REPO['BaseURL']='http://packages.asterisk.org/centos/$releasever/current/$basearch/'
-REPO['MirrorList']=''
-REPO['GPGKey']=''
+REPO['BaseURL']=''#https://ast.tucny.com/repo/asterisk-common/el$releasever/$basearch/
+REPO['MirrorList']='https://ast.tucny.com/mirrorlist.php?release=$releasever&arch=$basearch&repo=asterisk-common'
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://ast.tucny.com/repo/RPM-GPG-KEY-dtucny'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
+
+
 #####################
 #####################
-# Digium Repo
+#atomic
 #####################
 #####################
-REPO['reponame']='digium-current'
-REPO['fullreponame']='Digium packages - EL'
+REPO['reponame']='atomic'
+REPO['pkgname']=${REPO['reponame']}
+REPO['fullreponame']='Atomic'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
 REPO['status']='disabled'
-REPO['BaseURL']='http://packages.digium.com/centos/$releasever/current/$basearch/'
-REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']=''
+REPO['BaseURL']=''
+REPO['MirrorList']='http://www.atomicorp.com/mirrorlist/atomic/centos-$releasever-$basearch'
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://www.atomicorp.com/RPM-GPG-KEY.art.txt'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
 #####################
-# Digium 13
+# BareOS
 #####################
 #####################
-REPO['reponame']='digium-13'
-REPO['fullreponame']='Digium-13 packages - EL'
+REPO['reponame']='bareos20'
+REPO['pkgname']='bareos'
+REPO['fullreponame']='Backup Archiving Recovery Open Sourced'
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='disabled'
+REPO['BaseURL']='https://download.bareos.org/bareos/release/20/CentOS_$releasever'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://download.bareos.org/bareos/release/20/CentOS_$releasever/repodata/repomd.xml.key'
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+REPO['Priority']=''
+createrepo
+
+REPO['reponame']='bareos20-source'
+REPO['pkgname']='bareos'
+REPO['fullreponame']='Backup Archiving Recovery Open Sourced - Sources'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
 REPO['status']='disabled'
-REPO['BaseURL']='http://packages.digium.com/centos/$releasever/digium-13/$basearch/'
+REPO['BaseURL']='https://download.bareos.org/bareos/release/20/CentOS_$releasever/src'
 REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://download.bareos.org/bareos/release/20/CentOS_$releasever/repodata/repomd.xml.key'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
-#####################
-#####################
-#atomic
-#####################
-#####################
-REPO['reponame']='atomic'
-REPO['fullreponame']='Atomic'
+REPO['reponame']='bareos20-debuginfo'
+REPO['pkgname']='bareos'
+REPO['fullreponame']='Backup Archiving Recovery Open Sourced - Debuginfo'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
 REPO['status']='disabled'
-REPO['BaseURL']=''
-REPO['MirrorList']='http://www.atomicorp.com/mirrorlist/atomic/centos-$releasever-$basearch'
+REPO['BaseURL']='https://download.bareos.org/bareos/release/20/CentOS_$releasever/debug'
+REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
-REPO['GPGKey']='https://www.atomicorp.com/RPM-GPG-KEY.art.txt'
+REPO['GPGKey']='https://download.bareos.org/bareos/release/20/CentOS_$releasever/repodata/repomd.xml.key'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
+
+
 #####################
 #####################
 #centos-sclo-centos
 #####################
 #####################
 REPO['reponame']='centos-sclo-centos'
+REPO['pkgname']="centos-sclo" #${REPO['reponame']}
 REPO['fullreponame']='Centos-RH Software collections'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
-REPO['status']='disabled'
+REPO['status']='enabled'
 REPO['BaseURL']='http://mirror.centos.org/centos/$releasever/sclo/$basearch/sclo/'
 REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-SCLo'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']='10'
 createrepo
 
 #####################
@@ -243,24 +356,68 @@ createrepo
 #####################
 #####################
 REPO['reponame']='centos-sclo-rh'
+REPO['pkgname']='centos-sclo' #${REPO['reponame']}
 REPO['fullreponame']='Centos-RH Software collections'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
-REPO['status']='disabled'
+REPO['status']='enabled'
 REPO['BaseURL']='http://mirror.centos.org/centos/$releasever/sclo/$basearch/rh/'
 REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-SCLo'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']='10'
 createrepo
 
 #####################
 #####################
+#collaboraoffice.com
+#####################
+#####################
+REPO['reponame']='collaboraoffice'
+REPO['pkgname']=${REPO['reponame']}
+REPO['fullreponame']='collaboraoffice.com_repos_CollaboraOnline_CODE-centos'
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='enabled'
+REPO['BaseURL']='https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-centos$releasever'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-centos7/repodata/repomd.xml.key'
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+REPO['Priority']=''
+createrepo
+
+#####################
+#####################
+#docker-ce
+#####################
+#####################
+REPO['reponame']='docker-ce'
+REPO['pkgname']=${REPO['reponame']}
+REPO['fullreponame']='docker-ce'
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='enabled'
+REPO['BaseURL']='https://download.docker.com/linux/centos/$releasever/$basearch/stable'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://download.docker.com/linux/centos/gpg'
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+REPO['Priority']=''
+createrepo
+
+
+#####################
+#####################
 #egroupware
 #####################
 #####################
 REPO['reponame']='egroupware'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='server_eGroupWare'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -271,6 +428,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://download.opensuse.org/repositories/server:/eGroupWare/CentOS_$releasever/repodata/repomd.xml.key'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -278,9 +436,10 @@ createrepo
 #elastic
 #####################
 #####################
-declare -A elashort=( ['6.x']='6.x' ['5.x']='5.x' ['1.6']='1' )
-for elasver  in "6.x" "5.x" "1.6"; do 
+declare -A elashort=(['oss-8.x']='oss-8.x' ['8.x']='8.x' ['7.x']='7.x' ['6.x']='6.x' ['5.x']='5.x' ['1.6']='1' )
+for elasver  in "8.x" "7.x" "6.x" "5.x" "1.6"; do 
 REPO['reponame']="elastic${elashort[$elasver]}"
+REPO['pkgname']='elastic'
 REPO['fullreponame']="Elasticsearch repository for $elasver packages"
 REPO['EnableGroups']='yes'
 REPO['Visible']='yes'
@@ -291,6 +450,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://artifacts.elastic.co/GPG-KEY-elasticsearch'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 done
 
@@ -300,6 +460,7 @@ done
 #####################
 #####################
 REPO['reponame']='elrepo'
+REPO['pkgname']='elrepo'
 REPO['fullreponame']='ELRepo.org Community Enterprise Linux Repository'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -310,6 +471,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://elrepo.org/RPM-GPG-KEY-elrepo.org'
 REPO['Exclude']='clamav,spamassassin,libselinux,perl-HTML-Parser,lm_sensors,perl-IO-stringy,perl-XML-Parser,razor-agents,libgcrypt,rpm-python,libxml2,zlib,gnupg,libxml2-python,yum,module-init-tools,rpm,gettext,librpm4,glib2,perl-libwww-perl,perl-Convert-ASN1,beecrypt,fetchmail,libacl,libtool-ltdl,popt,libgpg-error,freetype,perl-MIME-tools,mutt,gd,perl-TimeDate,librpm4.4'
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -318,6 +480,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='elrepo-kernel'
+REPO['pkgname']='elrepo'
 REPO['fullreponame']='ELRepo.org Community Enterprise Linux Repository Kernel'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -328,6 +491,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://elrepo.org/RPM-GPG-KEY-elrepo.org'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -336,6 +500,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='epel'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='EPEL'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -344,8 +509,9 @@ REPO['BaseURL']='http://download.fedorap
 REPO['MirrorList']='http://mirrors.fedoraproject.org/mirrorlist?repo=epel-$releasever&arch=$basearch'
 REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL'
-REPO['Exclude']='perl-Razor-Agent'
+REPO['Exclude']='perl-Razor-Agent,pwauth'
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -354,6 +520,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='erlang'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='erlang programming language'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -364,6 +531,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://packages.erlang-solutions.com/rpm/erlang_solutions.asc'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -372,6 +540,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='freeswitch'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Freeswitch'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -382,6 +551,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='file:///etc/pki/rpm-gpg/RPM-GPG-KEY-FREESWITCH'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -390,6 +560,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='fws'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Firewall Services'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -400,6 +571,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://repo.firewall-services.com/RPM-GPG-KEY'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -408,6 +580,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='fws-testing'
+REPO['pkgname']='fws'
 REPO['fullreponame']='Firewall Services testing'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -418,189 +591,215 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://repo.firewall-services.com/RPM-GPG-KEY'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
 #####################
-# Geekery  (last update 2016-09-25)
+#fusion inventory 
 #####################
 #####################
-REPO['reponame']='geekery'
-REPO['fullreponame']='geekery repository'
+REPO['reponame']='fusioninventory-agent'
+REPO['pkgname']='fusioninventory-agent'
+REPO['fullreponame']='Copr repo for fusioninventory-agent owned by trasher'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
 REPO['status']='disabled'
-REPO['BaseURL']=''
-REPO['MirrorList']='http://geekery.epac.to/geekery/el$releasever-mirrors'
+REPO['BaseURL']='https://download.copr.fedorainfracloud.org/results/trasher/fusioninventory-agent/epel-$releasever-$basearch/'
+REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
-REPO['GPGKey']='http://geekery.altervista.org/download.php?filename=GEEKERY-GPG-KEY'
+REPO['GPGKey']='https://download.copr.fedorainfracloud.org/results/trasher/fusioninventory-agent/pubkey.gpg'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
-createrepo 
+REPO['Priority']=''
+createrepo
+
 
 #####################
 #####################
-# Libreswan
+# LemonLDAP-NG
 #####################
 #####################
-REPO['reponame']='libreswan'
-REPO['fullreponame']='Libreswan'
+REPO['reponame']='lemonldap-ng'
+REPO['pkgname']='lemonldap'
+REPO['fullreponame']='LemonLDAP::NG packages'
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
-REPO['status']='disabled'
-REPO['BaseURL']='http://download.libreswan.org/binaries/rhel/$releasever/$basearch/'
+REPO['Visible']='yes'
+REPO['status']='enabled'
+REPO['BaseURL']='https://lemonldap-ng.org/redhat/stable/$releasever/noarch'
 REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
-REPO['GPGKey']='http://download.libreswan.org/binaries/RPM-GPG-KEY-libreswan'
+REPO['GPGKey']='https://lemonldap-ng.org/_media/rpm-gpg-key-ow2'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
-createrepo 
-
+REPO['Priority']=''
+createrepo
 
-#####################
-#####################
-# NodeJS 4
-#####################
-#####################
-REPO['reponame']='node4'
-REPO['fullreponame']='NodeJS 4'
+REPO['reponame']='lemonldap-ng-extras'
+REPO['pkgname']='lemonldap'
+REPO['fullreponame']='LemonLDAP::NG extra packages'
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_4.x/el/$releasever/$basearch/'
+REPO['BaseURL']='https://lemonldap-ng.org/redhat/extras/$releasever/noarch'
 REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://lemonldap-ng.org/_media/rpm-gpg-key-ow2'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
-#####################
-#####################
-# NodeJS 5
-#####################
-#####################
-REPO['reponame']='node5'
-REPO['fullreponame']='NodeJS 5'
+EPO['reponame']='lemonldap-ng-1.4'
+REPO['pkgname']='lemonldap1.4'
+REPO['fullreponame']='LemonLDAP::NG packages 1.4'
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_5.x/el/$releasever/$basearch/'
+REPO['BaseURL']='https://lemonldap-ng.org/redhat/1.4/$releasever/noarch'
 REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://lemonldap-ng.org/_media/rpm-gpg-key-ow2'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
-#####################
-#####################
-# NodeJS 6
-#####################
-#####################
-REPO['reponame']='node6'
-REPO['fullreponame']='NodeJS 6'
+REPO['reponame']='lemonldap-ng-1.9'
+REPO['pkgname']='lemonldap1.9'
+REPO['fullreponame']='LemonLDAP::NG packages 1.9'
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_6.x/el/$releasever/$basearch/'
+REPO['BaseURL']='https://lemonldap-ng.org/redhat/1.9/$releasever/noarch'
 REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://lemonldap-ng.org/_media/rpm-gpg-key-ow2'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
-#####################
-#####################
-# NodeJS 7
-#####################
-#####################
-REPO['reponame']='node7'
-REPO['fullreponame']='NodeJS 7'
+REPO['reponame']='lemonldap-ng-2.0'
+REPO['pkgname']='lemonldap2.0'
+REPO['fullreponame']='LemonLDAP::NG packages 2.0'
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_7.x/el/$releasever/$basearch/'
+REPO['BaseURL']='https://lemonldap-ng.org/redhat/2.0/$releasever/noarch'
 REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://lemonldap-ng.org/_media/rpm-gpg-key-ow2'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
+
 #####################
 #####################
-# NodeJS
+# Libreswan
 #####################
 #####################
-REPO['reponame']='node8'
-REPO['fullreponame']='NodeJS 8'
+REPO['reponame']='libreswan'
+REPO['pkgname']=${REPO['reponame']}
+REPO['fullreponame']='Libreswan'
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_8.x/el/$releasever/$basearch/'
+REPO['BaseURL']='http://download.libreswan.org/binaries/rhel/$releasever/$basearch/'
 REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='http://download.libreswan.org/RPM-GPG-KEY-libreswan'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
-createrepo
+REPO['Priority']='10'
+createrepo 
+
 
 #####################
 #####################
-# NodeJS 9
+# Mongodb
 #####################
 #####################
-REPO['reponame']='node9'
-REPO['fullreponame']='NodeJS 9'
+for nodever  in "4.0" "4.1" "4.2" "4.3" "4.4" "5.0" "6.0" "7.0"; do
+REPO['reponame']="mongodb$nodever"
+REPO['pkgname']='mongodb'
+REPO['fullreponame']="Mongodb $nodever"
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_9.x/el/$releasever/$basearch/'
+REPO['BaseURL']="https://repo.mongodb.org/yum/redhat/\$releasever/mongodb-org/$nodever/\$basearch/"
 REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
+REPO['GPGCheck']='yes'
+REPO['GPGKey']="https://www.mongodb.org/static/pgp/server-$nodever.asc"
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
+done
 
 #####################
 #####################
-# NodeJS 10
+# Nginx
 #####################
 #####################
-REPO['reponame']='node10'
-REPO['fullreponame']='NodeJS 10'
+REPO['reponame']='nginx'
+REPO['pkgname']='nginx'
+REPO['fullreponame']='nginx stable repo'
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
+REPO['status']='enabled'
+REPO['BaseURL']='http://nginx.org/packages/centos/$releasever/$basearch/'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://nginx.org/keys/nginx_signing.key'
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+REPO['Priority']=''
+createrepo
+
+REPO['reponame']='nginx-mainline'
+REPO['pkgname']='nginx'
+REPO['fullreponame']='nginx mainline repo'
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_10.x/el/$releasever/$basearch/'
+REPO['BaseURL']='http://nginx.org/packages/mainline/centos/$releasever/$basearch/'
 REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://nginx.org/keys/nginx_signing.key'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
+
+
+
 #####################
 #####################
-# NodeJS 11
+# NodeJS 4
 #####################
 #####################
-REPO['reponame']='node11'
-REPO['fullreponame']='NodeJS 11'
+for nodever  in "4" "5" "6" "7" "8" "9" "10" "11" "12" "13" "14" "15" "16" "17"; do
+REPO['reponame']="node$nodever"
+REPO['pkgname']='node'
+REPO['fullreponame']="NodeJS $nodever"
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_11.x/el/$releasever/$basearch/'
+REPO['BaseURL']="https://rpm.nodesource.com/pub_$nodever.x/el/\$releasever/\$basearch/"
 REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL'
+#'https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
+#'https://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
-
+done
 
 
 if  ( "%{?dist}"  == "el7" ); then
@@ -610,9 +809,10 @@ if  ( "%{?dist}"  == "el7" ); then
 #####################
 #####################
 REPO['reponame']='odoo10-nightly'
+REPO['pkgname']='odoo'
 REPO['fullreponame']='Odoo 10 Nightly - EL7'
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
 REPO['BaseURL']='http://nightly.odoo.com/10.0/nightly/rpm/'
 REPO['MirrorList']=''
@@ -620,6 +820,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://nightly.odoo.com/odoo.key'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -628,9 +829,10 @@ createrepo
 #####################
 #####################
 REPO['reponame']='odoo9-nightly'
+REPO['pkgname']='odoo'
 REPO['fullreponame']='Odoo 9 Nightly - EL7'
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
 REPO['BaseURL']='http://nightly.odoo.com/9.0/nightly/rpm/'
 REPO['MirrorList']=''
@@ -638,6 +840,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://nightly.odoo.com/odoo.key'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 fi
 
@@ -647,9 +850,10 @@ fi
 #####################
 #####################
 REPO['reponame']='okay'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Extra OKay Packages for Enterprise Linux - Freeswitch and FusionPBX'
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
 REPO['BaseURL']='http://repo.okay.com.mx/centos/$releasever/$basearch/release'
 REPO['MirrorList']=''
@@ -657,6 +861,27 @@ REPO['GPGCheck']='no'
 REPO['GPGKey']=''
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
+createrepo
+
+#####################
+#####################
+# Onlyoffice
+#####################
+#####################
+REPO['reponame']='onlyoffice'
+REPO['pkgname']=${REPO['reponame']}
+REPO['fullreponame']='Onlyoffice document server - community edition'
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='enabled'
+REPO['BaseURL']='https://download.onlyoffice.com/repo/centos/main/noarch/'
+REPO['MirrorList']=''
+REPO['GPGCheck']='no'
+REPO['GPGKey']='https://raw.githubusercontent.com/ONLYOFFICE/repo/master/centos/RPM-GPG-KEY-ONLYOFFICE'
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -665,6 +890,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='openfusion'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Openfusion'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -673,44 +899,88 @@ REPO['BaseURL']='http://repo.openfusion.
 REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://repo.openfusion.net/RPM-GPG-KEY-openfusion'
-REPO['Exclude']='perl-Devel-StackTrace,perl-ExtUtils-MakeMaker,perl-List-MoreUtils,perl-Exporter-Tiny,perl-ExtUtils-Install,perl-parent'
-REPO['IncludePkgs']='perl-Algorithm-C3,perl-App-cpanminus,perl-B-Hooks-EndOfScope,perl-B-Hooks-OP-Check,perl-CPAN-Metanoarch,perl-Carp,perl-Class-C3,perl-Class-Load,perl-Class-Load-XS,perl-Class-Method-Modifiers,perl-Class-Singleton,perl-Class-XSAccessor,perl-Clone-PP,perl-Data-Dumper-Concise,perl-Data-IEEE754,perl-Data-OptList,perl-Data-Printer,perl-Data-Validate-IP,perl-DateTime,perl-DateTime-Locale,perl-DateTime-TimeZone,perl-Devel-GlobalDestruction,perl-Dist-CheckConflicts,perl-Eval-Closure,perl-Exporter-Tiny,perl-ExtUtils-CBuilder,perl-ExtUtils-Install,perl-ExtUtils-Manifest,perl-File-HomeDir,perl-File-Which,perl-GeoIP2,perl-Hash-FieldHash,perl-IPC-Cmd,perl-Lexical-SealRequireHints,perl-List-AllUtils,perl-Locale-Maketext-Simple,perl-MRO-Compat,perl-Math-Int128,perl-Math-Int64,perl-MaxMind-DB-Common,perl-MaxMind-DB-Reader,perl-Module-Build,perl-Module-CoreList,perl-Module-Implementation,perl-Module-Load,perl-Module-Load-Conditional,perl-Module-Runtime,perl-Moo,perl-MooX-StrictConstructor,perl-MooX-Types-MooseLike,perl-Moose,perl-Net-Works,perl-Package-DeprecationManager,perl-Package-Stash,perl-Package-Stash-XS,perl-Params-Check,perl-Params-Classify,perl-Params-Validate,perl-Perl-OSType,perl-Role-Tiny,perl-Scalar-List-Utils,perl-Socket,perl-Sort-Naturally,perl-Sub-Exporter,perl-Sub-Exporter-Progressive,perl-Sub-Identify,perl-Sub-Install,perl-Sub-Name,perl-Sub-Quote,perl-Task-Weaken,perl-Term-ANSIColor,perl-Test-Warnings,perl-Throwable,perl-Try-Tiny,perl-Variable-Magic,perl-bareword-filehandles,perl-indirect,perl-multidimensional,perl-namespace-autoclean,perl-namespace-clean,perl-strictures,perl-Devel-StackTrace,perl-ExtUtils-MakeMaker,perl-List-MoreUtils,perl-parent'
+REPO['Exclude']='perl-Devel-StackTrace,perl-ExtUtils-MakeMaker,perl-List-MoreUtils,perl-ExtUtils-Install,perl-parent'
+REPO['IncludePkgs']='perl-Algorithm-C3,perl-App-cpanminus,perl-B-Hooks-EndOfScope,perl-B-Hooks-OP-Check,perl-CPAN-Metanoarch,perl-Carp,perl-Class-C3,perl-Class-Load,perl-Class-Load-XS,perl-Class-Method-Modifiers,perl-Class-Singleton,perl-Class-XSAccessor,perl-Clone-PP,perl-Data-Dumper-Concise,perl-Data-IEEE754,perl-Data-OptList,perl-Data-Printer,perl-Data-Validate-IP,perl-DateTime,perl-DateTime-Locale,perl-DateTime-TimeZone,perl-Devel-GlobalDestruction,perl-Dist-CheckConflicts,perl-Eval-Closure,perl-Exporter-Tiny,perl-ExtUtils-CBuilder,perl-ExtUtils-Install,perl-ExtUtils-Manifest,perl-File-HomeDir,perl-File-Which,perl-GeoIP2,perl-Hash-FieldHash,perl-IPC-Cmd,perl-Lexical-SealRequireHints,perl-List-AllUtils,perl-Locale-Maketext-Simple,perl-MRO-Compat,perl-Math-Int128,perl-Math-Int64,perl-MaxMind-DB-Common,perl-MaxMind-DB-Reader,perl-Module-Build,perl-Module-CoreList,perl-Module-Implementation,perl-Module-Load,perl-Module-Load-Conditional,perl-Module-Runtime,perl-Moo,perl-MooX-StrictConstructor,perl-MooX-Types-MooseLike,perl-Moose,perl-Net-Works,perl-Package-DeprecationManager,perl-Package-Stash,perl-Package-Stash-XS,perl-Params-Check,perl-Params-Classify,perl-Params-Validate,perl-Perl-OSType,perl-Role-Tiny,perl-Scalar-List-Utils,perl-Socket,perl-Sort-Naturally,perl-Sub-Exporter,perl-Sub-Exporter-Progressive,perl-Sub-Identify,perl-Sub-Install,perl-Sub-Name,perl-Sub-Quote,perl-Task-Weaken,perl-Term-ANSIColor,perl-Test-Warnings,perl-Throwable,perl-Try-Tiny,perl-Variable-Magic,perl-bareword-filehandles,perl-indirect,perl-multidimensional,perl-namespace-autoclean,perl-namespace-clean,perl-strictures,perl-Devel-StackTrace,perl-ExtUtils-MakeMaker,perl-List-MoreUtils,perl-parent,perl-Array-Compare,perl-Type-Tiny,perl-Filesys-DiskFree,perl-Array-Compare,perl-Type-Tiny,perl-JSON'
+REPO['Priority']=''
 createrepo
 
 #####################
 #####################
-# Reetspetit
+# Postgresql
 #####################
 #####################
-REPO['reponame']='reetp'
-REPO['fullreponame']='Mirror John Crisp reetspetit.com'
+for pgsqlver  in   "12" "13" "14" "15" "16"; do
+REPO['reponame']="pgsql$pgsqlver"
+REPO['pkgname']='pgsql'
+REPO['fullreponame']="Postgresql $pgsqlver"
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
 REPO['status']='disabled'
-REPO['BaseURL']='https://www.reetspetit.com/smeserver/$releasever'
+REPO['BaseURL']='https://yum.postgresql.org/'$pgsqlver'/redhat/rhel-$releasever-$basearch/'
 REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://www.reetspetit.com/RPM-GPG-KEY'
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL7'
+#https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL
+#https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-AARCH64-RHEL
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+REPO['Priority']=''
+createrepo
+
+
+REPO['reponame']="pgsql$pgsqlver-nonfree"
+REPO['pkgname']='pgsql'
+REPO['fullreponame']="Postgresql $pgsqlver non free"
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='disabled'
+REPO['BaseURL']='https://download.postgresql.org/pub/repos/yum/non-free/'$pgsqlver'/redhat/rhel-$releasever-$basearch/'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL7-nonfree'
+#https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL-nonfree
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
+REPO['reponame']="pgsql$pgsqlver-common"
+REPO['pkgname']='pgsql'
+REPO['fullreponame']="Postgresql $pgsqlver non free"
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='disabled'
+REPO['BaseURL']='https://download.postgresql.org/pub/repos/yum/common/'$pgsqlver'/redhat/rhel-$releasever-$basearch/'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL7'
+#https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL
+#https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-AARCH64-RHEL
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+REPO['Priority']=''
+createrepo
+
+done
+
 #####################
 #####################
-#remi-safe
+# Reetspetit
 #####################
 #####################
-REPO['reponame']='remi-safe'
-REPO['fullreponame']='Remi - safe'
+REPO['reponame']='reetp'
+REPO['pkgname']=${REPO['reponame']}
+REPO['fullreponame']='Mirror John Crisp reetspetit.com'
 REPO['EnableGroups']='no'
-REPO['GPGCheck']='yes'
 REPO['Visible']='yes'
-REPO['status']='enabled'
-REPO['BaseURL']='http://rpms.famillecollet.com/enterprise/$releasever/safe/$basearch/'
+REPO['status']='disabled'
+REPO['BaseURL']='https://www.reetspetit.com/smeserver/$releasever'
 REPO['MirrorList']=''
-REPO['GPGKey']='http://rpms.famillecollet.com/RPM-GPG-KEY-remi'
+REPO['GPGCheck']='no'
+REPO['GPGKey']='https://www.reetspetit.com/RPM-GPG-KEY'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -719,6 +989,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='remi'
+REPO['pkgname']='remi-unsafe'
 REPO['fullreponame']='Remi - EL unsafe, will conflict with your base rpms'
 REPO['EnableGroups']='no'
 REPO['GPGCheck']='yes'
@@ -729,6 +1000,7 @@ REPO['MirrorList']=''
 REPO['GPGKey']='http://rpms.famillecollet.com/RPM-GPG-KEY-remi'
 REPO['Exclude']='mysql*,php-*,phpMyAdmin'
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -737,6 +1009,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='remi-ocsinventory'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Remi ocsinventory - EL'
 REPO['EnableGroups']='no'
 REPO['GPGCheck']='yes'
@@ -747,6 +1020,7 @@ REPO['MirrorList']=''
 REPO['GPGKey']='http://rpms.famillecollet.com/RPM-GPG-KEY-remi'
 REPO['Exclude']=''
 REPO['IncludePkgs']='ocsinventory* perl-Ocsinventory-Agent'
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -755,6 +1029,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='remi-roundcube'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Remi Roundcube - EL'
 REPO['EnableGroups']='no'
 REPO['GPGCheck']='yes'
@@ -765,6 +1040,7 @@ REPO['MirrorList']=''
 REPO['GPGKey']='http://rpms.famillecollet.com/RPM-GPG-KEY-remi'
 REPO['Exclude']=''
 REPO['IncludePkgs']='php-kolab-net-ldap3,php-pear-Mail-mimeDecode,php-pear-Net-IDNA2,php-pear-Net-LDAP2,roundcubemail'
+REPO['Priority']=''
 createrepo
 
 
@@ -774,6 +1050,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='rpmfusion'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='rpmfusion free EL'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -784,6 +1061,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://rpmfusion.org/keys?action=AttachFile&do=get&target=RPM-GPG-KEY-rpmfusion-free-el-$releasever'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -792,6 +1070,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='rpmfusion-nonfree'
+REPO['pkgname']='rpmfusion'
 REPO['fullreponame']='rpmfusion nonfree EL'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -802,6 +1081,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://rpmfusion.org/keys?action=AttachFile&do=get&target=RPM-GPG-KEY-rpmfusion-nonfree-el-$releasever'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -810,6 +1090,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='sogo'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Inverse SOGo 2 Repository'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -820,6 +1101,7 @@ REPO['GPGCheck']='no'
 REPO['GPGKey']=''
 REPO['Exclude']=''
 REPO['IncludePkgs']='gnustep-base,gnustep-make,libmemcached,libwbxml,sogo*,sope49*'
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -828,6 +1110,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='sogo3'
+REPO['pkgname']='sogo'
 REPO['fullreponame']='Inverse SOGo 3 Repository'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -838,6 +1121,7 @@ REPO['GPGCheck']='no'
 REPO['GPGKey']=''
 REPO['Exclude']=''
 REPO['IncludePkgs']='gnustep-base,gnustep-make,libmemcached,libwbxml,sogo*,sope49*'
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -846,6 +1130,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='sogo4'
+REPO['pkgname']='sogo'
 REPO['fullreponame']='Inverse SOGo 4 Repository'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -856,6 +1141,7 @@ REPO['GPGCheck']='no'
 REPO['GPGKey']=''
 REPO['Exclude']=''
 REPO['IncludePkgs']='gnustep-base,gnustep-make,libmemcached,libwbxml,sogo*,sope49*'
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -864,6 +1150,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='sogo-subscription'
+REPO['pkgname']='sogo'
 REPO['fullreponame']='Inverse SOGo Repository only with subscription'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -874,6 +1161,7 @@ REPO['GPGCheck']='no'
 REPO['GPGKey']=''
 REPO['Exclude']=''
 REPO['IncludePkgs']='gnustep-base,gnustep-make,libmemcached,libwbxml,sogo*,sope49*'
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -882,6 +1170,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='spectrum2'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Spectrum2'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -892,6 +1181,7 @@ REPO['GPGCheck']='no'
 REPO['GPGKey']=''
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -900,6 +1190,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='springdale-core'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS core Base'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -910,9 +1201,11 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://puias.princeton.edu/data/puias/$releasever/$basearch/os/RPM-GPG-KEY-puias'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 REPO['reponame']='springdale-updates'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS core Updates'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -923,9 +1216,11 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://puias.princeton.edu/data/puias/$releasever/updates/$basearch/en/os/RPM-GPG-KEY-puias'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 REPO['reponame']='springdale-addons'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS Addons'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -936,9 +1231,11 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://puias.princeton.edu/data/puias/$releasever/$basearch/os/RPM-GPG-KEY-puias'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 REPO['reponame']='springdale-addons-updates'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS Addons Updates'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -949,10 +1246,12 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://puias.princeton.edu/data/puias/$releasever/$basearch/os/RPM-GPG-KEY-puias'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 
 REPO['reponame']='springdale-unsupported'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS Unsupported'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -963,9 +1262,11 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://puias.princeton.edu/data/puias/$releasever/$basearch/os/RPM-GPG-KEY-puias'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 REPO['reponame']='springdale-computational'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS Computational'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -976,6 +1277,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://puias.princeton.edu/data/puias/$releasever/$basearch/os/RPM-GPG-KEY-puias'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 
@@ -987,6 +1289,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='stephdl'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Mirror Stephane de Labrusse'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -997,6 +1300,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://mirror.de-labrusse.fr/RPM-GPG-KEY'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -1005,6 +1309,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='virtualbox'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='RHEL/CentOS VirtualBox'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -1015,6 +1320,27 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://www.virtualbox.org/download/oracle_vbox.asc'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
+createrepo
+
+#####################
+#####################
+#Wandisco git
+#####################
+#####################
+REPO['reponame']='WANdisco-git'
+REPO['pkgname']=${REPO['reponame']}
+REPO['fullreponame']='WANdisco Distribution of git'
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='enabled'
+REPO['BaseURL']='https://opensource.wandisco.com/rhel/$releasever/git/$basearch'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']="https://opensource.wandisco.com/RPM-GPG-KEY-WANdisco"
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+REPO['Priority']='10'
 createrepo
 
 #####################
@@ -1023,6 +1349,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='webtatic'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='webtatic - EL'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -1037,6 +1364,7 @@ REPO['GPGKey']="http://repo.webtatic.com
 fi
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -1045,6 +1373,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='xymon'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Xymon Terabithia RPMS - EL'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -1055,6 +1384,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']="http://terabithia.org/rpms/RPM-GPG-KEY-JCLEAVER"
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -1062,9 +1392,10 @@ createrepo
 #Zabbix2.4
 #####################
 #####################
-declare -A zabshort=( ['1.8']='18' ['2.0']='20' ['2.0']='20' ['2.4']='24' ['3.0']='30' ['3.2']='32' ['3.4']='34' ['4.0']='40' ['4.2']='42' ['4.4']='44')
-for elasver  in "4.2" "4.4" ; do
+declare -A zabshort=( ['1.8']='18' ['2.0']='20' ['2.0']='20' ['2.4']='24' ['3.0']='30' ['3.2']='32' ['3.4']='34' ['4.0']='40' ['4.2']='42' ['4.4']='44' ['4.5']='45' ['5.0']='50' ['5.1']='51' ['5.2']='52' ['5.3']='53' ['5.4']='54'  ['5.5']='55' )
+for elasver  in "4.2" "4.4"  '4.5' '5.0' '5.1' '5.2' '5.3' '5.4' '5.5'; do
 REPO['reponame']="zabbix${zabshort[$elasver]}"
+REPO['pkgname']='zabbix'
 REPO['fullreponame']="Zabbix $elasver Official Repository"
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -1072,18 +1403,40 @@ REPO['status']='disabled'
 REPO['BaseURL']="http://repo.zabbix.com/zabbix/$elasver/rhel/\$releasever/\$basearch/"
 REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
-REPO['GPGKey']="http://repo.zabbix.com/RPM-GPG-KEY-ZABBIX"
+REPO['GPGKey']="http://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-A14FE591"
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 done
 
+# webfront sclo
+for elasver  in '5.0' '5.1'; do
+REPO['reponame']="zabbix${zabshort[$elasver]}-frontend"
+REPO['pkgname']='zabbix'
+REPO['fullreponame']="Zabbix $elasver Official Repository"
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='disabled'
+REPO['BaseURL']="http://repo.zabbix.com/zabbix/$elasver/rhel/\$releasever/\$basearch/frontend/"
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']="http://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-A14FE591"
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+REPO['Priority']=''
+createrepo
+done
+
+
+
 #####################
 #####################
 #zmrepo
 #####################
 #####################
 REPO['reponame']='zmrepo'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='ZoneMinder Repo - EL'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -1094,6 +1447,7 @@ REPO['GPGCheck']='no'
 REPO['GPGKey']=""
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 
@@ -1134,7 +1488,7 @@ EOF
 
 cat << 'EOF'  >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/10epel
 {
-    my @add = split(/[,; ]+/, '');
+    my @add = split(/[,; ]+/, 'pwauth');
     my %remove = map { $_ => 1 } split(/[,; ]+/, 'gnustep-*,gnustep*,gnustep-base,gnustep-make');
 
     for my $name ( qw(epel) )
@@ -1177,25 +1531,13 @@ cat << 'EOF'  >$RPM_BUILD_ROOT/etc/e-smi
 
 EOF
 
-cat << 'EOF'  >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/10asterisk
-{
-    for my $name ( qw(asterisk-current) )
-    {
-        my $repo = $DB->get($name) or next;
-        my $BaseURL = $repo->prop('BaseURL') || '';
-        if ($BaseURL =~ s/centos\$/centos\/\$/g)
-		{$repo->set_prop('BaseURL', $BaseURL);}
-    }
-
-}
-
-EOF
 
 cat << 'EOF'  >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/10openfusion
 {
-    my @addexclude = split(/,/,"perl-Devel-StackTrace,perl-ExtUtils-MakeMaker,perl-List-MoreUtils,perl-Exporter-Tiny,perl-ExtUtils-Install,perl-parent");
+    my @addexclude = split(/,/,"perl-Devel-StackTrace,perl-ExtUtils-MakeMaker,perl-List-MoreUtils,perl-ExtUtils-Install,perl-parent");
     my %removeexclude = map { $_ => 1 } split(/[,; ]+/, 'perl-version');
-    my @addinclude = split(/,/,"perl-Algorithm-C3,perl-App-cpanminus,perl-B-Hooks-EndOfScope,perl-B-Hooks-OP-Check,perl-CPAN-Metanoarch,perl-Carp,perl-Class-C3,perl-Class-Load,perl-Class-Load-XS,perl-Class-Method-Modifiers,perl-Class-Singleton,perl-Class-XSAccessor,perl-Clone-PP,perl-Data-Dumper-Concise,perl-Data-IEEE754,perl-Data-OptList,perl-Data-Printer,perl-Data-Validate-IP,perl-DateTime,perl-DateTime-Locale,perl-DateTime-TimeZone,perl-Devel-GlobalDestruction,perl-Dist-CheckConflicts,perl-Eval-Closure,perl-Exporter-Tiny,perl-ExtUtils-CBuilder,perl-ExtUtils-Install,perl-ExtUtils-Manifest,perl-File-HomeDir,perl-File-Which,perl-GeoIP2,perl-Hash-FieldHash,perl-IPC-Cmd,perl-Lexical-SealRequireHints,perl-List-AllUtils,perl-Locale-Maketext-Simple,perl-MRO-Compat,perl-Math-Int128,perl-Math-Int64,perl-MaxMind-DB-Common,perl-MaxMind-DB-Reader,perl-Module-Build,perl-Module-CoreList,perl-Module-Implementation,perl-Module-Load,perl-Module-Load-Conditional,perl-Module-Runtime,perl-Moo,perl-MooX-StrictConstructor,perl-MooX-Types-MooseLike,perl-Moose,perl-Net-Works,perl-Package-DeprecationManager,perl-Package-Stash,perl-Package-Stash-XS,perl-Params-Check,perl-Params-Classify,perl-Params-Validate,perl-Perl-OSType,perl-Role-Tiny,perl-Scalar-List-Utils,perl-Socket,perl-Sort-Naturally,perl-Sub-Exporter,perl-Sub-Exporter-Progressive,perl-Sub-Identify,perl-Sub-Install,perl-Sub-Name,perl-Sub-Quote,perl-Task-Weaken,perl-Term-ANSIColor,perl-Test-Warnings,perl-Throwable,perl-Try-Tiny,perl-Variable-Magic,perl-bareword-filehandles,perl-indirect,perl-multidimensional,perl-namespace-autoclean,perl-namespace-clean,perl-strictures,perl-Devel-StackTrace,perl-ExtUtils-MakeMaker,perl-List-MoreUtils,perl-parent");
+    my @addinclude = split(/,/,"perl-Algorithm-C3,perl-App-cpanminus,perl-B-Hooks-EndOfScope,perl-B-Hooks-OP-Check,perl-CPAN-Metanoarch,perl-Carp,perl-Class-C3,perl-Class-Load,perl-Class-Load-XS,perl-Class-Method-Modifiers,perl-Class-Singleton,perl-Class-XSAccessor,perl-Clone-PP,perl-Data-Dumper-Concise,perl-Data-IEEE754,perl-Data-OptList,perl-Data-Printer,perl-Data-Validate-IP,perl-DateTime,perl-DateTime-Locale,perl-DateTime-TimeZone,perl-Devel-GlobalDestruction,perl-Dist-CheckConflicts,perl-Eval-Closure,perl-Exporter-Tiny,perl-ExtUtils-CBuilder,perl-ExtUtils-Install,perl-ExtUtils-Manifest,perl-File-HomeDir,perl-File-Which,perl-GeoIP2,perl-Hash-FieldHash,perl-IPC-Cmd,perl-Lexical-SealRequireHints,perl-List-AllUtils,perl-Locale-Maketext-Simple,perl-MRO-Compat,perl-Math-Int128,perl-Math-Int64,perl-MaxMind-DB-Common,perl-MaxMind-DB-Reader,perl-Module-Build,perl-Module-CoreList,perl-Module-Implementation,perl-Module-Load,perl-Module-Load-Conditional,perl-Module-Runtime,perl-Moo,perl-MooX-StrictConstructor,perl-MooX-Types-MooseLike,perl-Moose,perl-Net-Works,perl-Package-DeprecationManager,perl-Package-Stash,perl-Package-Stash-XS,perl-Params-Check,perl-Params-Classify,perl-Params-Validate,perl-Perl-OSType,perl-Role-Tiny,perl-Scalar-List-Utils,perl-Socket,perl-Sort-Naturally,perl-Sub-Exporter,perl-Sub-Exporter-Progressive,perl-Sub-Identify,perl-Sub-Install,perl-Sub-Name,perl-Sub-Quote,perl-Task-Weaken,perl-Term-ANSIColor,perl-Test-Warnings,perl-Throwable,perl-Try-Tiny,perl-Variable-Magic,perl-bareword-filehandles,perl-indirect,perl-multidimensional,perl-namespace-autoclean,perl-namespace-clean,perl-strictures,perl-Devel-StackTrace,perl-ExtUtils-MakeMaker,perl-List-MoreUtils,perl-parent,perl-Array-Compare,perl-Type-Tiny,perl-Filesys-DiskFree,perl-Array-Compare,perl-Type-Tiny");
+
     my %removeinclude = map { $_ => 1 } split(/[,; ]+/, '');
 
     for my $name ( qw(openfusion) )
@@ -1232,14 +1574,57 @@ cat << 'EOF'  >$RPM_BUILD_ROOT/etc/e-smi
             $repo->delete('IncludePkgs');
         }
 
+    }
+
+}
 
 
-    }
+EOF
 
+
+cat << 'EOF'  >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/30mongodbDeleteOldRepos
+{
+    for my $dbVer (qw( 0.9 1.0 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7)) {
+        $dataBase = "mongodb$dbVer";
+        my $repo = $DB->get($dataBase);
+        $repo->delete if $repo;
+    }
 }
 
 EOF
 
+cat << 'EOF'  >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/30pgsql
+{
+    # delete old repos
+    for my $dbVer (qw( 9.6 10 11)) {
+        $dataBase = "pgsql$dbVer";
+        my $repo = $DB->get($dataBase);
+        $repo->delete if $repo;
+        $dataBase = "pgsql$dbVer-common";
+        my $repo = $DB->get($dataBase);
+        $repo->delete if $repo;
+        $dataBase = "pgsql$dbVer-nonfree";
+        my $repo = $DB->get($dataBase);
+        $repo->delete if $repo;
+    }
+    # update keys
+    #old was https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-** 
+    #new is https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL7
+    for my $dbVer (qw( 12 13)) {
+       for my $case (qw(nonfree common)) {
+           $dataBase = "pgsql$dbVer-$case"; 
+           my $repo = $DB->get($dataBase) or next;
+           my $gpgurl = $repo->prop('GPGKey');
+           $repo->setprop('GPGKey','https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL7') if (index($gpgurl, "keys") == -1)       
+       }
+       $dataBase = "pgsql$dbVer";
+       my $repo = $DB->get($dataBase) or next;
+       my $gpgurl = $repo->prop('GPGKey');
+       $repo->set_prop('GPGKey','https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL7') if (index($gpgurl, "keys") == -1)
+    }
+}
+
+EOF
 
 
 
@@ -1247,9 +1632,12 @@ EOF
 
 rm -f %{name}-%{version}-filelist*
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT 			> %{name}-%{version}-filelist
+cat %{name}-%{version}-filelist|grep asterisk 			> %{name}-%{version}-filelist-asterisk
 cat %{name}-%{version}-filelist| grep atomic			> %{name}-%{version}-filelist-atomic
+cat %{name}-%{version}-filelist| grep bareos			> %{name}-%{version}-filelist-bareos
 cat %{name}-%{version}-filelist| grep centos-sclo		> %{name}-%{version}-filelist-centos-sclo
-cat %{name}-%{version}-filelist| egrep 'digium|asterisk'   	> %{name}-%{version}-filelist-asterisk 
+cat %{name}-%{version}-filelist| grep collaboraoffice		> %{name}-%{version}-filelist-collaboraoffice
+cat %{name}-%{version}-filelist| grep docker-ce			> %{name}-%{version}-filelist-docker-ce
 cat %{name}-%{version}-filelist| grep egroupware 		> %{name}-%{version}-filelist-egroupware
 cat %{name}-%{version}-filelist| grep elastic			> %{name}-%{version}-filelist-elastic
 cat %{name}-%{version}-filelist| grep elrepo			> %{name}-%{version}-filelist-elrepo
@@ -1257,30 +1645,34 @@ cat %{name}-%{version}-filelist| grep ep
 cat %{name}-%{version}-filelist| grep erlang			> %{name}-%{version}-filelist-erlang
 cat %{name}-%{version}-filelist| grep freeswitch		> %{name}-%{version}-filelist-freeswitch
 cat %{name}-%{version}-filelist| grep fws			> %{name}-%{version}-filelist-fws
-cat %{name}-%{version}-filelist| grep geekery			> %{name}-%{version}-filelist-geekery
+cat %{name}-%{version}-filelist| grep fusioninventory-agent     > %{name}-%{version}-filelist-fusioninventory-agent
+cat %{name}-%{version}-filelist| grep lemonldap			> %{name}-%{version}-filelist-lemonldap
 cat %{name}-%{version}-filelist| grep libreswan			> %{name}-%{version}-filelist-libreswan
+cat %{name}-%{version}-filelist| grep mongodb                   > %{name}-%{version}-filelist-mongodb
+cat %{name}-%{version}-filelist| grep nginx			> %{name}-%{version}-filelist-nginx
+cat %{name}-%{version}-filelist| grep node                      > %{name}-%{version}-filelist-node
 if  ( "%{?dist}"  == "el7" ); then
 cat %{name}-%{version}-filelist| grep odoo			> %{name}-%{version}-filelist-odoo
 fi
 cat %{name}-%{version}-filelist| grep okay			> %{name}-%{version}-filelist-okay
+cat %{name}-%{version}-filelist| grep -i onlyoffice		> %{name}-%{version}-filelist-onlyoffice
 cat %{name}-%{version}-filelist| grep openfusion		> %{name}-%{version}-filelist-openfusion
-cat %{name}-%{version}-filelist| grep node			> %{name}-%{version}-filelist-node
 cat %{name}-%{version}-filelist| grep reetp			> %{name}-%{version}-filelist-reetp
-cat %{name}-%{version}-filelist| grep remi-safe			> %{name}-%{version}-filelist-remi-safe
 cat %{name}-%{version}-filelist| grep remi-ocsinventory         > %{name}-%{version}-filelist-remi-ocsinventory
 cat %{name}-%{version}-filelist| grep remi-roundcube            > %{name}-%{version}-filelist-remi-roundcube
-cat %{name}-%{version}-filelist| grep remi|egrep -v 'safe|ocsinventory|roundcube'	> %{name}-%{version}-filelist-remi
+cat %{name}-%{version}-filelist| grep remi|egrep -v 'ocsinventory|roundcube'	> %{name}-%{version}-filelist-remi
 cat %{name}-%{version}-filelist| grep rpmfusion			> %{name}-%{version}-filelist-rpmfusion
 cat %{name}-%{version}-filelist| grep sogo			> %{name}-%{version}-filelist-sogo
 cat %{name}-%{version}-filelist| grep spectrum2			> %{name}-%{version}-filelist-spectrum2
 cat %{name}-%{version}-filelist| grep springdale		> %{name}-%{version}-filelist-springdale
 cat %{name}-%{version}-filelist| grep stephdl			> %{name}-%{version}-filelist-stephdl
 cat %{name}-%{version}-filelist| grep virtualbox		> %{name}-%{version}-filelist-virtualbox
+cat %{name}-%{version}-filelist| grep -i wandisco               > %{name}-%{version}-filelist-wandisco
 cat %{name}-%{version}-filelist| grep webtatic			> %{name}-%{version}-filelist-webtatic
 cat %{name}-%{version}-filelist| grep xymon			> %{name}-%{version}-filelist-xymon
 cat %{name}-%{version}-filelist| grep zabbix			> %{name}-%{version}-filelist-zabbix
 cat %{name}-%{version}-filelist| grep zmrepo			> %{name}-%{version}-filelist-zmrepo
-
+cat %{name}-%{version}-filelist| grep pgsql                    > %{name}-%{version}-filelist-pgsql
 %clean
 cd ..
 rm -rf %{name}-%{version}
@@ -1307,6 +1699,13 @@ case "$1" in
 		# this is an upgrade
 	;;
 esac
+%package asterisk
+Summary: Asterisk Repository tucny.com
+%description asterisk
+Asterisk Repository tucny.com
+%files asterisk -f  %{name}-%{version}-filelist-asterisk
+%defattr(-,root,root)
+
 %package atomic
 Summary: Atomic Repository
 %description atomic
@@ -1314,6 +1713,13 @@ Atomic Repository
 %files atomic -f  %{name}-%{version}-filelist-atomic
 %defattr(-,root,root)
 
+%package bareos
+Summary: Backup Archiving Recovery Open Sourced 
+%description bareos
+Backup Archiving Recovery Open Sourced  repository
+%files bareos -f  %{name}-%{version}-filelist-bareos
+%defattr(-,root,root)
+
 %package centos-sclo
 Summary: CentOS Red-Hat software collection repository
 %description centos-sclo
@@ -1321,11 +1727,18 @@ CentOS Red-Hat software collection repos
 %files centos-sclo -f  %{name}-%{version}-filelist-centos-sclo
 %defattr(-,root,root) 
 
-%package asterisk
-Summary: All repositories you need for Asterisk and FreePBX
-%description asterisk
-All repositories you need for Asterisk and FreePBX
-%files asterisk -f  %{name}-%{version}-filelist-asterisk
+%package collaboraoffice
+Summary: collaboraoffice repo
+%description collaboraoffice
+collaboraoffice repo
+%files collaboraoffice -f  %{name}-%{version}-filelist-collaboraoffice
+%defattr(-,root,root)
+
+%package docker-ce
+Summary: docker-ce
+%description docker-ce
+docker-ce repo
+%files docker-ce -f  %{name}-%{version}-filelist-docker-ce
 %defattr(-,root,root)
 
 %package egroupware
@@ -1377,11 +1790,18 @@ Firewall Services repository
 %files fws -f  %{name}-%{version}-filelist-fws
 %defattr(-,root,root)
 
-%package geekery
-Summary: Geekery Repository
-%description geekery
-Geekery Repository
-%files geekery -f  %{name}-%{version}-filelist-geekery
+%package fusioninventory-agent
+Summary: Copr repo for fusioninventory-agent owned by trasher
+%description fusioninventory-agent
+Copr repo for fusioninventory-agent owned by trasher
+%files fusioninventory-agent -f  %{name}-%{version}-filelist-fusioninventory-agent
+%defattr(-,root,root)
+
+%package lemonldap
+Summary: Lemonldap NG Repository
+%description lemonldap
+LemonLDAP::NG Repository
+%files lemonldap -f  %{name}-%{version}-filelist-lemonldap
 %defattr(-,root,root)
 
 %package libreswan
@@ -1391,6 +1811,20 @@ Libreswan Repository
 %files libreswan -f  %{name}-%{version}-filelist-libreswan
 %defattr(-,root,root)
 
+%package mongodb
+Summary: MongoDB Repositories
+%description mongodb
+MongoDB Repositories
+%files mongodb -f  %{name}-%{version}-filelist-mongodb
+%defattr(-,root,root)
+
+%package nginx
+Summary: nginx Repositories
+%description nginx
+Nginx Repositories
+%files nginx -f  %{name}-%{version}-filelist-nginx
+%defattr(-,root,root)
+
 %package node
 Summary: NodeJS Repositories
 %description node
@@ -1414,6 +1848,13 @@ Extra OKay Packages for Enterprise Linux
 %files okay -f  %{name}-%{version}-filelist-okay
 %defattr(-,root,root)
 
+%package onlyoffice
+Summary: onlyoffice Repository
+%description onlyoffice
+onlyoffice Repository
+%files onlyoffice  -f %{name}-%{version}-filelist-onlyoffice
+%defattr(-,root,root)
+
 %package openfusion
 Summary: Openfusion Repository
 %description openfusion
@@ -1421,6 +1862,13 @@ Openfusion Repository
 %files openfusion -f  %{name}-%{version}-filelist-openfusion
 %defattr(-,root,root)
 
+%package pgsql
+Summary: PostGreSQL Repositories
+%description pgsql
+PostGreSQL Repositories
+%files pgsql -f  %{name}-%{version}-filelist-pgsql
+%defattr(-,root,root)
+
 %package reetp
 Summary: Mirror John Crisp reetspetit.com
 %description reetp
@@ -1428,13 +1876,6 @@ Mirror John Crisp reetspetit.com
 %files reetp -f  %{name}-%{version}-filelist-reetp
 %defattr(-,root,root)
 
-%package remi-safe
-Summary: Remi safe repository
-%description remi-safe
-Remi safe repository
-%files remi-safe -f  %{name}-%{version}-filelist-remi-safe
-%defattr(-,root,root)
-
 %package remi-ocsinventory
 Summary: Remi repository filtered to install OCSinventory
 %description remi-ocsinventory
@@ -1498,6 +1939,13 @@ Virtualbox Repository
 %files virtualbox -f  %{name}-%{version}-filelist-virtualbox
 %defattr(-,root,root)
 
+%package wandisco
+Summary: WANdisco Distribution of git
+%description wandisco
+WANdisco Distribution of git
+%files wandisco -f  %{name}-%{version}-filelist-wandisco
+%defattr(-,root,root)
+
 %package webtatic
 Summary: Webtatic Repository
 %description webtatic