From f6aa086ffc8cf27f2ecacd805c3ddf5da6288a2f Mon Sep 17 00:00:00 2001 From: Elbakyan Shirak Date: Sun, 1 Sep 2024 20:59:49 +0400 Subject: [PATCH] Add identity packages --- install/deb/debian/control | 18 ++++++++++-- .../deb/debian/product-identity-api.install | 1 + .../product-identity-authorization.install | 1 + .../debian/product-identity-migration.install | 1 + install/deb/debian/product-identity.install | 3 -- install/rpm/SPECS/files.spec | 18 ++++++++---- install/rpm/SPECS/package.spec | 28 ++++++++++++++++--- install/rpm/SPECS/product.spec | 4 ++- 8 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 install/deb/debian/product-identity-api.install create mode 100644 install/deb/debian/product-identity-authorization.install create mode 100644 install/deb/debian/product-identity-migration.install delete mode 100644 install/deb/debian/product-identity.install diff --git a/install/deb/debian/control b/install/deb/debian/control index 0903270674..74dde4eec3 100644 --- a/install/deb/debian/control +++ b/install/deb/debian/control @@ -151,11 +151,23 @@ Description: {{product}}-ssoauth SAML-based single sign-on (SSO) authentication to provide a more quick, easy and secure way to access DocSpace for users -Package: {{product}}-identity +Package: {{product}}-identity-api Architecture: all Multi-Arch: foreign -Depends: {{product}}-common (= {{package_header_tag_version}}), nodejs (>= 16), ${misc:Depends}, ${shlibs:Depends} -Description: {{product}}-identity +Depends: {{product}}-common (= {{package_header_tag_version}}), java (> 21), nodejs (>= 16), ${misc:Depends}, ${shlibs:Depends} +Description: {{product}}-identity-api + +Package: {{product}}-identity-migration +Architecture: all +Multi-Arch: foreign +Depends: {{product}}-common (= {{package_header_tag_version}}), java (> 21), nodejs (>= 16), ${misc:Depends}, ${shlibs:Depends} +Description: {{product}}-identity-migration + +Package: {{product}}-identity-authorization +Architecture: all +Multi-Arch: foreign +Depends: {{product}}-common (= {{package_header_tag_version}}), java (> 21), nodejs (>= 16), ${misc:Depends}, ${shlibs:Depends} +Description: {{product}}-identity-authorization Package: {{product}}-backup-background Architecture: all diff --git a/install/deb/debian/product-identity-api.install b/install/deb/debian/product-identity-api.install new file mode 100644 index 0000000000..502b64e5c1 --- /dev/null +++ b/install/deb/debian/product-identity-api.install @@ -0,0 +1 @@ +debian/build/server/publish/services/ASC.Identity.Registration/service/* var/www/{{product}}/services/ASC.Identity.Registration diff --git a/install/deb/debian/product-identity-authorization.install b/install/deb/debian/product-identity-authorization.install new file mode 100644 index 0000000000..78b42433c5 --- /dev/null +++ b/install/deb/debian/product-identity-authorization.install @@ -0,0 +1 @@ +debian/build/server/publish/services/ASC.Identity.Authorization/service/* var/www/{{product}}/services/ASC.Identity.Authorization diff --git a/install/deb/debian/product-identity-migration.install b/install/deb/debian/product-identity-migration.install new file mode 100644 index 0000000000..2cab874d65 --- /dev/null +++ b/install/deb/debian/product-identity-migration.install @@ -0,0 +1 @@ +debian/build/server/publish/services/ASC.Identity.Migration/service/* var/www/{{product}}/services/ASC.Identity.Migration \ No newline at end of file diff --git a/install/deb/debian/product-identity.install b/install/deb/debian/product-identity.install deleted file mode 100644 index c939dddef6..0000000000 --- a/install/deb/debian/product-identity.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/build/server/publish/services/ASC.Identity.Registration/service/* var/www/{{product}}/services/ASC.Identity.Registration -debian/build/server/publish/services/ASC.Identity.Authorization/service/* var/www/{{product}}/services/ASC.Identity.Authorization -debian/build/server/publish/services/ASC.Identity.Migration/service/* var/www/{{product}}/services/ASC.Identity.Migration \ No newline at end of file diff --git a/install/rpm/SPECS/files.spec b/install/rpm/SPECS/files.spec index 0e8e867891..8127e33438 100644 --- a/install/rpm/SPECS/files.spec +++ b/install/rpm/SPECS/files.spec @@ -131,14 +131,22 @@ /usr/lib/systemd/system/%{product}-ssoauth.service %dir %{buildpath}/services/ -%files identity +%files identity-api +%defattr(-, onlyoffice, onlyoffice, -) +%{buildpath}/services/ASC.Identity.Registration +/usr/lib/systemd/system/%{product}-identity-api.service +%dir %{buildpath}/services/ + +%files identity-migration +%defattr(-, onlyoffice, onlyoffice, -) +%{buildpath}/services/ASC.Identity.Migration +/usr/lib/systemd/system/%{product}-identity-migration.service +%dir %{buildpath}/services/ + +%files identity-authorization %defattr(-, onlyoffice, onlyoffice, -) %{buildpath}/services/ASC.Identity.Authorization -%{buildpath}/services/ASC.Identity.Registration -%{buildpath}/services/ASC.Identity.Migration -/usr/lib/systemd/system/%{product}-identity-api.service /usr/lib/systemd/system/%{product}-identity-authorization.service -/usr/lib/systemd/system/%{product}-identity-migration.service %dir %{buildpath}/services/ %files clear-events diff --git a/install/rpm/SPECS/package.spec b/install/rpm/SPECS/package.spec index 1cf13e6a1c..ff5b7f85af 100644 --- a/install/rpm/SPECS/package.spec +++ b/install/rpm/SPECS/package.spec @@ -157,15 +157,35 @@ The service responsible for enabling and configuring SAML-based single sign-on (SSO) authentication to provide a more quick, easy and secure way to access DocSpace for users -%package identity +%package identity-migration Packager: %{packager} -Summary: Identity +Summary: Identity-Migration Group: Applications/Internet Requires: %name-common = %version-%release -Requires: dotnet-sdk-8.0 +Requires: java > 21 AutoReqProv: no BuildArch: noarch -%description identity +%description identity-migration + +%package identity-authorization +Packager: %{packager} +Summary: Identity-Authorization +Group: Applications/Internet +Requires: %name-common = %version-%release +Requires: java > 21 +AutoReqProv: no +BuildArch: noarch +%description identity-authorization + +%package identity-api +Packager: %{packager} +Summary: Identity-Api +Group: Applications/Internet +Requires: %name-common = %version-%release +Requires: java > 21 +AutoReqProv: no +BuildArch: noarch +%description identity-api %package clear-events Packager: %{packager} diff --git a/install/rpm/SPECS/product.spec b/install/rpm/SPECS/product.spec index 85ee948860..3d4021c446 100644 --- a/install/rpm/SPECS/product.spec +++ b/install/rpm/SPECS/product.spec @@ -51,7 +51,9 @@ Requires: %name-proxy = %version-%release Requires: %name-radicale = %version-%release Requires: %name-socket = %version-%release Requires: %name-ssoauth = %version-%release -Requires: %name-identity = %version-%release +Requires: %name-identity-migration = %version-%release +Requires: %name-identity-authorization = %version-%release +Requires: %name-identity-api = %version-%release Requires: %name-studio = %version-%release Requires: %name-studio-notify = %version-%release Requires: openssl