--- rpms/smeserver-extrarepositories/contribs10/smeserver-extrarepositories.spec	2022/02/25 02:50:32	1.16
+++ rpms/smeserver-extrarepositories/contribs10/smeserver-extrarepositories.spec	2023/07/26 14:02:02	1.22
@@ -1,6 +1,6 @@
 %define name smeserver-extrarepositories
 %define version 0.1
-%define release 36
+%define release 41
 Summary: easy configuration of extra yum repo
 Name: %{name}
 Version: %{version}
@@ -13,11 +13,30 @@ 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
 
 %description
 Provides configuration for external yum repository comaptible with Koozali SME Server.
 
 %changelog
+* 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]
@@ -143,6 +162,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/
+
 
 # if needing to migrate something :
 #mkdir -p $RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate
@@ -328,6 +349,45 @@ 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']=''
+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']=''
+createrepo
+
+
+#####################
+#####################
 #egroupware
 #####################
 #####################
@@ -569,14 +629,72 @@ 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']=''
+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']=''
+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']=''
+createrepo
+
+
+
+
+#####################
+#####################
 # NodeJS 4
 #####################
 #####################
@@ -660,6 +778,25 @@ 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']=''
+createrepo
+
+#####################
+#####################
 # Openfusion
 #####################
 #####################
@@ -689,12 +826,12 @@ REPO['fullreponame']="Postgresql $pgsqlv
 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/RPM-GPG-KEY-PGDG-'$ext
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
 createrepo
@@ -706,12 +843,12 @@ 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/RPM-GPG-KEY-PGDG-'$ext
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
 createrepo
@@ -722,12 +859,12 @@ 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/RPM-GPG-KEY-PGDG-'$ext
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
 createrepo
@@ -1301,10 +1438,21 @@ cat << 'EOF'  >$RPM_BUILD_ROOT/etc/e-smi
             $repo->delete('IncludePkgs');
         }
 
+    }
+
+}
 
 
-    }
+EOF
 
+
+cat << 'EOF'  >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/30DeleteOldMongoDB
+{
+    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
@@ -1320,6 +1468,8 @@ cat %{name}-%{version}-filelist|grep ast
 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| 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
@@ -1330,12 +1480,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
@@ -1405,6 +1558,20 @@ CentOS Red-Hat software collection repos
 %files centos-sclo -f  %{name}-%{version}-filelist-centos-sclo
 %defattr(-,root,root) 
 
+%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
 Summary: Repository for eGroupWare
 %description egroupware
@@ -1475,6 +1642,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
@@ -1498,6 +1679,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