Merge tag 'v2.3.2' into testing

diff --combined argeo-freed.spec
index 87b68e58c34a7e6aa0d24abdb0e312858cdb9de8,d75525851b0f9e87cf8bb51df3b9f5a4fc705fb6..aba7858992b41ffa144524d9cbb229a7e5ed31f5
--- 1/argeo-freed.spec
--- 2/argeo-freed.spec
+++ b/argeo-freed.spec
@@@ -1,5 -1,5 +1,5 @@@
  Name:           argeo-freed
- Version:        2.1.0
 -Version:        2.3.2
++Version:        2.1.1
  Release:        1%{?dist}
  Summary:        Enrollment into a FREEd compatible domain
  
@@@ -15,6 -15,16 +15,16 @@@ BuildRequires: systemd-rpm-macro
  
  %description
  
+ %package cms
+ Summary:        FREEd Argeo CMS services
+ Requires:       argeo-cms
+ 
+ %package cms-user
+ Summary:        FREEd Argeo CMS user services
+ Requires:       argeo-cms
+ 
+ %description cms
+ 
  %package libreswan
  Summary:        FREEd extensions to libreswan
  Requires:       libreswan
@@@ -39,15 -49,36 +49,36 @@@ Requires:       argeo-freed-libreswa
  %build
  
  %install
+ mkdir -p %{buildroot}%{_bindir}
+ cp -a ./usr/bin/* %{buildroot}%{_bindir}
+ 
  mkdir -p %{buildroot}%{_sysconfdir}
- cp -a ./etc/ipsec.d %{buildroot}%{_sysconfdir}
+ cp -a ./etc/* %{buildroot}%{_sysconfdir}
+ 
+ mkdir -p %{buildroot}%{_datadir}
+ cp -a ./usr/share/* %{buildroot}%{_datadir}
  
  mkdir -p %{buildroot}%{_unitdir}
  cp -a ./usr/lib/systemd/system/* %{buildroot}%{_unitdir}
  
+ mkdir -p %{buildroot}%{_userunitdir}
+ cp -a ./usr/lib/systemd/user/* %{buildroot}%{_userunitdir}
+ 
  mkdir -p %{buildroot}%{_libexecdir}
  cp -a ./usr/libexec/ipsec %{buildroot}%{_libexecdir}
  
+ %files cms
+ %attr(755, root, root) %{_bindir}/argeo
+ %attr(755, root, root) %{_bindir}/jshc
+ 
+ %{_sysconfdir}/argeo.d
+ %{_datadir}/argeo
+ %{_unitdir}/argeo@.service
+ 
+ %files cms-user
+ %{_sysconfdir}/argeo.user.d
+ %{_userunitdir}/argeo@.service
+ 
  %files libreswan
  %attr(755, root, root) %{_libexecdir}/ipsec
  
@@@ -58,6 -89,24 +89,24 @@@
  %{_unitdir}/freed-onresume.service
  %{_unitdir}/freed-onsuspend.service
  
+ %post cms
+ %systemd_post argeo@.service
+ 
+ %preun cms
+ %systemd_preun argeo@.service
+ 
+ %postun cms
+ %systemd_postun argeo@.service
+ 
+ %post cms-user
+ %systemd_user_post argeo@.service
+ 
+ %preun cms-user
+ %systemd_user_preun argeo@.service
+ 
+ %postun cms-user
+ %systemd_user_postun argeo@.service
+ 
  %post roaming-client
  %systemd_post freed-ipsec-roaming@.service
  %systemd_post freed-onresume.service

diff --combined debian/changelog
index ff356dbdaf9d6511eeda247c7bdf241170f74c73,bcdff2f058c9de58f94845cea0d4daf5e9adbc58..266fae18ddd3861503e62707b8d90797d92c6031
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,5 +1,5 @@@
- argeo-freed (2.1.0) unstable; urgency=medium
 -argeo-freed (2.3.2) unstable; urgency=medium
++argeo-freed (2.1.1) testing; urgency=medium
  
    * Initial release
  
 - -- Mathieu Baudier <mbaudier@argeo.org>  Thu, 09 Mar 2023 06:33:35 +0100
 + -- Mathieu Baudier <mbaudier@argeo.org>  Sat, 03 Jun 2023 06:21:21 +0200