diff --git a/A-Ops-v1.0.1.tar.gz b/A-Ops-v1.0.1.tar.gz index 94b929c221442e57d4299aa44ac6027f07eb1bee..cc5eb1898880ce156ceecbe7bbf53d25650ffd9e 100644 Binary files a/A-Ops-v1.0.1.tar.gz and b/A-Ops-v1.0.1.tar.gz differ diff --git a/A-Ops-web-node-modules.tar.gz b/A-Ops-web-node-modules.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..3c48ba58f4274e30206ffd0e7afd5347927f5bfa Binary files /dev/null and b/A-Ops-web-node-modules.tar.gz differ diff --git a/A-Ops.spec b/A-Ops.spec index 30a9bf3d574eee93649d418b4f0f249ecc1d3305..4d6cc395c46c6d9b0d7632e02a8d051174c51c6d 100644 --- a/A-Ops.spec +++ b/A-Ops.spec @@ -1,11 +1,12 @@ +#needsrootforbuild Name: A-Ops -Version: 1.0.1 -Release: 1 +Version: v1.0.1 +Release: 2 Summary: The intelligent ops toolkit for openEuler License: MulanPSL2 URL: https://gitee.com/openeuler/A-Ops -Source0: %{name}-v%{version}.tar.gz - +Source0: %{name}-%{version}.tar.gz +Source1: A-Ops-web-node-modules.tar.gz # build for gopher BuildRequires: cmake gcc-c++ yum elfutils-devel clang >= 10.0.1 llvm libconfig-devel @@ -15,6 +16,9 @@ BuildRequires: librdkafka-devel libmicrohttpd-devel BuildRequires: python3-setuptools python3-connexion python3-werkzeug python3-libyang BuildRequires: git python3-devel systemd +# build for web +BuildRequires: nodejs node-gyp npm + %description The intelligent ops toolkit for openEuler @@ -132,10 +136,28 @@ Requires: python3-werkzeug python3-connexion python3-swagger-ui-bundle python3 pakcage of gala-ragdoll +%package -n aops-web +Summary: website for A-Ops +Requires: nginx + +%description -n aops-web +website for A-Ops, deployed by Nginx + + %define debug_package %{nil} %prep -%autosetup -n %{name}-v%{version} +%setup +%setup -T -D -a 1 +cp -r A-Ops-web-node-modules/node_modules aops-web/ + +# prepare for web +pushd aops-web +npm config set registry https://mirrors.huaweicloud.com/repository/npm/ +npm cache clean -f +npm install --global yarn +yarn config set registry https://mirrors.huaweicloud.com/repository/npm +popd %build @@ -195,6 +217,11 @@ pushd gala-ragdoll %py3_build popd +#build for aops-web +pushd aops-web +yarn build +popd + %install # install for utils @@ -247,6 +274,16 @@ pushd adoctor-cli popd +# install for web +pushd aops-web +mkdir -p %{buildroot}/opt/aops_web +cp -r dist %{buildroot}/opt/aops_web/ +mkdir -p %{buildroot}/%{_sysconfdir}/nginx +cp -r deploy/aops-nginx.conf %{buildroot}/%{_sysconfdir}/nginx/ +mkdir -p %{buildroot}/usr/lib/systemd/system +cp -r deploy/aops-web.service %{buildroot}/usr/lib/systemd/system/ +popd + #install for gala-gopher pushd gala-gopher install -d %{buildroot}/opt/gala-gopher @@ -392,9 +429,17 @@ fi %{python3_sitelib}/ragdoll-*.egg-info +%files -n aops-web +%attr(0755, root, root) /opt/aops_web/dist/* +%attr(0755, root, root) %{_sysconfdir}/nginx/aops-nginx.conf +%attr(0755, root, root) %{_unitdir}/aops-web.service + %changelog -* Mon Sep 6 2021 Lostwayzxc - 1.0.1-1 +* Mon Sep 6 2021 Yiru Wang - v1.0.1-2 +- add web build modle of the aops + +* Mon Sep 6 2021 Lostwayzxc - v1.0.1-1 - update src, add intelligent check and diagnosis module * Thu Sep 2 2021 zhaoyuxing - 1.0.0-4