Merge tag 'v2.3.6' into testing

diff --combined argeo-freed.spec
index 3535875b64f6f5a18e328d768744097fbb026906,e6ee1517c36b0da30825592606a449dd1079b6c2..38c6c840daf50286814d7ccc275283abcc39a063
--- 1/argeo-freed.spec
--- 2/argeo-freed.spec
+++ b/argeo-freed.spec
@@@ -1,5 -1,5 +1,5 @@@
  Name:           argeo-freed
- Version:        2.1.3
 -Version:        2.3.6
++Version:        2.1.4
  Release:        1%{?dist}
  Summary:        Utilities for a FREEd compatible domain
  
@@@ -19,10 -19,6 +19,6 @@@ BuildRequires: systemd-rpm-macro
  Summary:        FREEd Argeo CMS services
  Requires:       argeo-cms
  
- %package cms-user
- Summary:        FREEd Argeo CMS user services
- Requires:       argeo-cms
- 
  %description cms
  
  %package libreswan
@@@ -37,75 -33,42 +33,42 @@@ Requires:       argeo-freed-libreswa
  
  %description roaming-client
  
- %package roaming-host
- Summary:        FREEd roaming host
- Requires:       argeo-freed-libreswan
- 
- %description roaming-host
- 
  %prep
  %setup -q
  
  %build
  
  %install
- mkdir -p %{buildroot}%{_bindir}
- cp -a ./usr/bin/* %{buildroot}%{_bindir}
- 
- mkdir -p %{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}/default/argeo
  %{_sysconfdir}/argeo.d
- %{_datadir}/argeo
- %{_unitdir}/argeo@.service
- 
- %files cms-user
- %{_sysconfdir}/argeo.user.d
- %{_userunitdir}/argeo@.service
+ %{_sysconfdir}/argeo
+ %{_unitdir}/argeo*.service
+ %{_userunitdir}/argeo*.service
  
  %files libreswan
  %attr(755, root, root) %{_libexecdir}/ipsec
  
  %files roaming-client
- %{_sysconfdir}/ipsec.d/roaming.conf
- 
  %{_unitdir}/freed-ipsec-roaming@.service
  %{_unitdir}/freed-onresume.service
  %{_unitdir}/freed-onsuspend.service
  
  %post cms
  %systemd_post argeo@.service
+ %systemd_user_post argeo.service
  
  %preun cms
  %systemd_preun argeo@.service
+ %systemd_user_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
+ %systemd_user_postun argeo.service
  
  %post roaming-client
  %systemd_post freed-ipsec-roaming@.service
@@@ -121,7 -84,3 +84,3 @@@
  %systemd_postun freed-ipsec-roaming@.service
  %systemd_postun freed-onresume.service
  %systemd_postun freed-onsuspend.service
- 
- %files roaming-host
- %{_sysconfdir}/ipsec.d/roaming-host.conf
- %{_sysconfdir}/ipsec.d/roaming-host-domain.conf.template

diff --combined debian/changelog
index a4e47ce2bd6c8f903a1dd68c1713a348bb8ae7ca,d0d2678ed5c62f981d75940177ce3c8d2086e013..ac895c6c3511c48b94c1c09e0c08eab7bfd6b08c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,5 +1,5 @@@
- argeo-freed (2.1.3) testing; urgency=medium
 -argeo-freed (2.3.6) unstable; urgency=medium
++argeo-freed (2.1.4) testing; urgency=medium
  
-   * Adapt to changes in Argeo TP
+   * New directory structure
  
-  -- Mathieu Baudier <mbaudier@argeo.org>  Thu, 14 Dec 2023 05:48:41 +0000
 - -- Mathieu Baudier <mbaudier@argeo.org>  Wed, 13 Mar 2024 11:12:52 +0000
++ -- Mathieu Baudier <mbaudier@argeo.org>  Sat, 16 Mar 2024 07:25:57 +0000