diff --git a/node_modules.tar.gz b/node_modules.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0dd9caabe5fa5ff1c0fbab4162969ae225d90e99 Binary files /dev/null and b/node_modules.tar.gz differ diff --git a/sysom-2.0.tar.gz b/sysom-2.0.tar.gz index 169538dbb0183cdc467eb54134c8e271adb5cb5d..168acb6050adb777002cdc6df47bc4d9483a2c8c 100644 Binary files a/sysom-2.0.tar.gz and b/sysom-2.0.tar.gz differ diff --git a/sysom.spec b/sysom.spec old mode 100755 new mode 100644 index 7db0b01c582ba1cd8be7d6608000ab6f268eefca..1d6aa3807e740ea7a7c2cfc972327cef34f28d93 --- a/sysom.spec +++ b/sysom.spec @@ -7,10 +7,17 @@ Release: %{anolis_release}%{?dist} Summary: SysOM Server License: MIT Source0: https://gitee.com/anolis/sysom/repository/archive/v2.0/sysom-2.0.tar.gz +# We need to prepare some components needed nodejs front-end compilation under networking conditions in advance. +# Run 'nmp build' to generate node_modules. +Source1: node_modules.tar.gz +# Run 'nmp install yarn' to generate yarn . +Source2: yarn-1.22.19.tar.gz Requires: python3 python3-pip python3-virtualenv mariadb-server supervisor nginx redis wget nfs-utils rpcbind iproute -BuildRequires: nodejs >= 16.14.0 npm >= 8.3.1 +BuildRequires: nodejs >= 1:16.14.0 npm >= 8.3.1 URL: https://gitee.com/anolis/sysom +BuildArch: x86_64 + %description SysOM is committed to building an automatic operation and maintenance platform that integrates host management, configuration and deployment, @@ -18,66 +25,41 @@ monitoring and alarm, exception diagnosis, security audit and other functions %prep %setup -q -n %{name}-%{version} +pushd sysom_web +tar -xvf %{SOURCE1} +pushd node_modules +tar -xvf %{SOURCE2} +popd +popd + %build echo "build sysom ..........." echo ${PWD} -npm install -g yarn -pushd sysom_web || exit -yarn -yarn build -popd || exit +pushd sysom_web +sh ./node_modules/yarn/bin/yarn build --offline +popd echo "build sysom end" %pre %install -mkdir -p %{buildroot}/usr/local/sysom/server/target/sysom_web -mkdir -p %{buildroot}/usr/local/sysom/server/vmcore/vmcore-nfs -mkdir -p %{buildroot}/usr/local/sysom/server/logs/ -mkdir -p %{buildroot}/usr/local/sysom/server/conf/ -mkdir -p %{buildroot}/usr/local/sysom/init_scripts/ -mkdir -p %{buildroot}/etc/supervisord.d/ -mkdir -p %{buildroot}/usr/lib/systemd/system/ -cp -a sysom_api %{buildroot}/usr/local/sysom/server/target -cp -r sysom_web/dist/* %{buildroot}/usr/local/sysom/server/target/sysom_web/ -cp tools/deploy/nginx.conf %{buildroot}/usr/local/sysom/server/conf/ -cp tools/deploy/sysom.conf %{buildroot}/usr/local/sysom/server/conf/ -cp tools/deploy/sysom.ini %{buildroot}/etc/supervisord.d/ -cp tools/deploy/sysom-server.service %{buildroot}/usr/lib/systemd/system/ -cp -a script/* %{buildroot}/usr/local/sysom/init_scripts/ -cp tools/deploy/task-service.ini %{buildroot}/etc/supervisord.d/ -cp tools/deploy/channel-service.ini %{buildroot}/etc/supervisord.d/ +mkdir -p %{buildroot}/usr/local/sysom/server/target +cp -a sysom_server %{buildroot}/usr/local/sysom/server/target +cp -a sysom_web/dist %{buildroot}/usr/local/sysom/server/target/sysom_web +cp -a script %{buildroot}/usr/local/sysom/init_scripts %files /usr/local/sysom/ -/etc/supervisord.d/sysom.ini -/etc/supervisord.d/task-service.ini -/etc/supervisord.d/channel-service.ini -/usr/lib/systemd/system/ %post -mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.bak -cp /usr/local/sysom/server/conf/nginx.conf /etc/nginx/ -cp /usr/local/sysom/server/conf/sysom.conf /etc/nginx/conf.d/ -sed -i "s;/home/sysom;/usr/local/sysom/server;g" /etc/nginx/conf.d/sysom.conf -sed -i "s;/home/sysom;/usr/local/sysom/server;g" /etc/supervisord.d/sysom.ini -sed -i "s;/home/sysom;/usr/local/sysom/server;g" /usr/local/sysom/server/target/sysom_api/uwsgi.ini -cpu_num=`cat /proc/cpuinfo | grep processor | wc -l` -sed -i "s/threads = 3/threads = $cpu_num/g" /usr/local/sysom/server/target/sysom_api/conf/task_gunicorn.py -sed -i "s/threads = 3/threads = $cpu_num/g" /usr/local/sysom/server/target/sysom_api/conf/channel_gunicorn.py -systemctl daemon-reload -systemctl enable sysom-server.service + +%preun +bash -x /usr/local/sysom/init_scripts/server/clear.sh %postun -systemctl stop sysom-server -sed -i '/sysom/d' /var/spool/cron/root -mv /etc/nginx/nginx.conf.bak /etc/nginx/nginx.conf -rm -f /etc/supervisord.d/sysom.ini -rm -f /etc/supervisord.d/task-service.ini -rm -f /etc/supervisord.d/channel-service.ini rm -rf /usr/local/sysom %changelog -* Mon Aug 8 2022 huangtuquan - 2.0 +* Fri Dec 12 2022 huangtuquan - 2.0 - sysom server release 2.0 diff --git a/yarn-1.22.19.tar.gz b/yarn-1.22.19.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..73deff005bc7998fe1809c534fab2deaf8f6b16b Binary files /dev/null and b/yarn-1.22.19.tar.gz differ