--- rpms/smeserver-extrarepositories/contribs10/smeserver-extrarepositories.spec	2022/03/10 16:53:26	1.19
+++ 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 38
+%define release 44
 Summary: easy configuration of extra yum repo
 Name: %{name}
 Version: %{version}
@@ -13,11 +13,37 @@ BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
 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]
 
@@ -149,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
@@ -185,6 +213,8 @@ touch $RPM_BUILD_ROOT/etc/e-smith/events
                 $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
 }
 
@@ -207,6 +237,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']="https://ast.tucny.com/repo/RPM-GPG-KEY-dtucny"
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 done
 
@@ -222,6 +253,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://ast.tucny.com/repo/RPM-GPG-KEY-dtucny'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 
@@ -243,6 +275,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://www.atomicorp.com/RPM-GPG-KEY.art.txt'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -262,6 +295,7 @@ 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'
@@ -276,6 +310,7 @@ 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-debuginfo'
@@ -290,6 +325,7 @@ 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
 
 
@@ -311,6 +347,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-SCLo'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']='10'
 createrepo
 
 #####################
@@ -330,6 +367,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-SCLo'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']='10'
 createrepo
 
 #####################
@@ -349,6 +387,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-centos7/repodata/repomd.xml.key'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -368,6 +407,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://download.docker.com/linux/centos/gpg'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 
@@ -388,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
 
 #####################
@@ -395,8 +436,8 @@ 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"
@@ -409,6 +450,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://artifacts.elastic.co/GPG-KEY-elasticsearch'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 done
 
@@ -429,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
 
 #####################
@@ -448,6 +491,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://elrepo.org/RPM-GPG-KEY-elrepo.org'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -467,6 +511,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL'
 REPO['Exclude']='perl-Razor-Agent,pwauth'
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -486,6 +531,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://packages.erlang-solutions.com/rpm/erlang_solutions.asc'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -505,6 +551,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='file:///etc/pki/rpm-gpg/RPM-GPG-KEY-FREESWITCH'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -524,6 +571,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://repo.firewall-services.com/RPM-GPG-KEY'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -543,6 +591,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://repo.firewall-services.com/RPM-GPG-KEY'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -562,6 +611,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://download.copr.fedorainfracloud.org/results/trasher/fusioninventory-agent/pubkey.gpg'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 
@@ -575,13 +625,14 @@ REPO['pkgname']='lemonldap'
 REPO['fullreponame']='LemonLDAP::NG packages'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
-REPO['status']='disabled'
+REPO['status']='enabled'
 REPO['BaseURL']='https://lemonldap-ng.org/redhat/stable/$releasever/noarch'
 REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://lemonldap-ng.org/_media/rpm-gpg-key-ow2'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 REPO['reponame']='lemonldap-ng-extras'
@@ -596,8 +647,53 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://lemonldap-ng.org/_media/rpm-gpg-key-ow2'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
+createrepo
+
+EPO['reponame']='lemonldap-ng-1.4'
+REPO['pkgname']='lemonldap1.4'
+REPO['fullreponame']='LemonLDAP::NG packages 1.4'
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='disabled'
+REPO['BaseURL']='https://lemonldap-ng.org/redhat/1.4/$releasever/noarch'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://lemonldap-ng.org/_media/rpm-gpg-key-ow2'
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
+REPO['reponame']='lemonldap-ng-1.9'
+REPO['pkgname']='lemonldap1.9'
+REPO['fullreponame']='LemonLDAP::NG packages 1.9'
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='disabled'
+REPO['BaseURL']='https://lemonldap-ng.org/redhat/1.9/$releasever/noarch'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://lemonldap-ng.org/_media/rpm-gpg-key-ow2'
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+REPO['Priority']=''
+createrepo
+
+REPO['reponame']='lemonldap-ng-2.0'
+REPO['pkgname']='lemonldap2.0'
+REPO['fullreponame']='LemonLDAP::NG packages 2.0'
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='disabled'
+REPO['BaseURL']='https://lemonldap-ng.org/redhat/2.0/$releasever/noarch'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://lemonldap-ng.org/_media/rpm-gpg-key-ow2'
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+REPO['Priority']=''
+createrepo
 
 
 #####################
@@ -614,14 +710,75 @@ REPO['status']='disabled'
 REPO['BaseURL']='http://download.libreswan.org/binaries/rhel/$releasever/$basearch/'
 REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
-REPO['GPGKey']='http://download.libreswan.org/binaries/RPM-GPG-KEY-libreswan'
+REPO['GPGKey']='http://download.libreswan.org/RPM-GPG-KEY-libreswan'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']='10'
 createrepo 
 
 
 #####################
 #####################
+# Mongodb
+#####################
+#####################
+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']='yes'
+REPO['status']='disabled'
+REPO['BaseURL']="https://repo.mongodb.org/yum/redhat/\$releasever/mongodb-org/$nodever/\$basearch/"
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']="https://www.mongodb.org/static/pgp/server-$nodever.asc"
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+REPO['Priority']=''
+createrepo
+done
+
+#####################
+#####################
+# Nginx
+#####################
+#####################
+REPO['reponame']='nginx'
+REPO['pkgname']='nginx'
+REPO['fullreponame']='nginx stable repo'
+REPO['EnableGroups']='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']='http://nginx.org/packages/mainline/centos/$releasever/$basearch/'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://nginx.org/keys/nginx_signing.key'
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+REPO['Priority']=''
+createrepo
+
+
+
+
+#####################
+#####################
 # NodeJS 4
 #####################
 #####################
@@ -640,6 +797,7 @@ REPO['GPGKey']='https://rpm.nodesource.c
 #'https://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 done
 
@@ -662,6 +820,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://nightly.odoo.com/odoo.key'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -681,6 +840,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='https://nightly.odoo.com/odoo.key'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 fi
 
@@ -701,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
 
 #####################
@@ -720,6 +901,7 @@ 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-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
 
 #####################
@@ -727,21 +909,22 @@ createrepo
 # Postgresql
 #####################
 #####################
-for pgsqlver  in  "9.6" "10" "11" "12" "13"; do
+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://yum.postgresql.org/'.$pgsqlver.'/redhat/rhel-$releasever-$basearch/'
+REPO['BaseURL']='https://yum.postgresql.org/'$pgsqlver'/redhat/rhel-$releasever-$basearch/'
 REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
-ext=$pgsqlver;
-[[ "$pgsqlver" == "9.6" ]] && ext="96";
-REPO['GPGKey']='https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-'.$ext
+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
 
 
@@ -751,14 +934,14 @@ REPO['fullreponame']="Postgresql $pgsqlv
 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['BaseURL']='https://download.postgresql.org/pub/repos/yum/non-free/'$pgsqlver'/redhat/rhel-$releasever-$basearch/'
 REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
-ext=$pgsqlver;
-[[ "$pgsqlver" == "9.6" ]] && ext="96";
-REPO['GPGKey']='https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-'.$ext
+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"
@@ -767,14 +950,15 @@ REPO['fullreponame']="Postgresql $pgsqlv
 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['BaseURL']='https://download.postgresql.org/pub/repos/yum/common/'$pgsqlver'/redhat/rhel-$releasever-$basearch/'
 REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
-ext=$pgsqlver;
-[[ "$pgsqlver" == "9.6" ]] && ext="96";
-REPO['GPGKey']='https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-'.$ext
+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
@@ -796,6 +980,7 @@ REPO['GPGCheck']='no'
 REPO['GPGKey']='https://www.reetspetit.com/RPM-GPG-KEY'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -815,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
 
 #####################
@@ -834,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
 
 #####################
@@ -853,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
 
 
@@ -873,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
 
 #####################
@@ -892,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
 
 #####################
@@ -911,6 +1101,7 @@ REPO['GPGCheck']='no'
 REPO['GPGKey']=''
 REPO['Exclude']=''
 REPO['IncludePkgs']='gnustep-base,gnustep-make,libmemcached,libwbxml,sogo*,sope49*'
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -930,6 +1121,7 @@ REPO['GPGCheck']='no'
 REPO['GPGKey']=''
 REPO['Exclude']=''
 REPO['IncludePkgs']='gnustep-base,gnustep-make,libmemcached,libwbxml,sogo*,sope49*'
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -949,6 +1141,7 @@ REPO['GPGCheck']='no'
 REPO['GPGKey']=''
 REPO['Exclude']=''
 REPO['IncludePkgs']='gnustep-base,gnustep-make,libmemcached,libwbxml,sogo*,sope49*'
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -968,6 +1161,7 @@ REPO['GPGCheck']='no'
 REPO['GPGKey']=''
 REPO['Exclude']=''
 REPO['IncludePkgs']='gnustep-base,gnustep-make,libmemcached,libwbxml,sogo*,sope49*'
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -987,6 +1181,7 @@ REPO['GPGCheck']='no'
 REPO['GPGKey']=''
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -1006,6 +1201,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
 
 REPO['reponame']='springdale-updates'
@@ -1020,6 +1216,7 @@ 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'
@@ -1034,6 +1231,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
 
 REPO['reponame']='springdale-addons-updates'
@@ -1048,6 +1246,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
 
 
@@ -1063,6 +1262,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
 
 REPO['reponame']='springdale-computational'
@@ -1077,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
 
 
@@ -1099,6 +1300,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://mirror.de-labrusse.fr/RPM-GPG-KEY'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -1118,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
 
 #####################
@@ -1141,6 +1364,7 @@ REPO['GPGKey']="http://repo.webtatic.com
 fi
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -1160,6 +1384,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']="http://terabithia.org/rpms/RPM-GPG-KEY-JCLEAVER"
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 #####################
@@ -1181,6 +1406,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']="http://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-A14FE591"
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 done
 
@@ -1198,6 +1424,7 @@ REPO['GPGCheck']='yes'
 REPO['GPGKey']="http://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-A14FE591"
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 done
 
@@ -1220,6 +1447,7 @@ REPO['GPGCheck']='no'
 REPO['GPGKey']=""
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
+REPO['Priority']=''
 createrepo
 
 
@@ -1346,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
 
 
 
@@ -1377,12 +1648,15 @@ cat %{name}-%{version}-filelist| grep fw
 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-ocsinventory         > %{name}-%{version}-filelist-remi-ocsinventory
 cat %{name}-%{version}-filelist| grep remi-roundcube            > %{name}-%{version}-filelist-remi-roundcube
@@ -1393,6 +1667,7 @@ cat %{name}-%{version}-filelist| grep sp
 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
@@ -1536,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
@@ -1559,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
@@ -1643,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