diff --git a/1001-change-to-python3.patch b/1001-change-to-python3.patch new file mode 100644 index 0000000000000000000000000000000000000000..8a064405233f08dba4c3d98d743240c6b111027b --- /dev/null +++ b/1001-change-to-python3.patch @@ -0,0 +1,55 @@ +From 54c40f6223a3a66d7f08984bfd526e1a75bc13d7 Mon Sep 17 00:00:00 2001 +From: happy_orange +Date: Mon, 30 Jan 2023 15:08:16 +0800 +Subject: [PATCH 1/1] change to python3 + +--- + sysom_server/sysom_diagnosis/manage.py | 2 +- + sysom_server/sysom_migration/manage.py | 2 +- + sysom_server/sysom_vmcore/manage.py | 2 +- + sysom_server/sysom_vul/manage.py | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/sysom_server/sysom_diagnosis/manage.py b/sysom_server/sysom_diagnosis/manage.py +index c3d6cc8..b58edc4 100755 +--- a/sysom_server/sysom_diagnosis/manage.py ++++ b/sysom_server/sysom_diagnosis/manage.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + """Django's command-line utility for administrative tasks.""" + import os + import sys +diff --git a/sysom_server/sysom_migration/manage.py b/sysom_server/sysom_migration/manage.py +index 8ea5cac..631b8b0 100755 +--- a/sysom_server/sysom_migration/manage.py ++++ b/sysom_server/sysom_migration/manage.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + """Django's command-line utility for administrative tasks.""" + import os + import sys +diff --git a/sysom_server/sysom_vmcore/manage.py b/sysom_server/sysom_vmcore/manage.py +index ce50f6d..6afa4d9 100644 +--- a/sysom_server/sysom_vmcore/manage.py ++++ b/sysom_server/sysom_vmcore/manage.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + """Django's command-line utility for administrative tasks.""" + import os + import sys +diff --git a/sysom_server/sysom_vul/manage.py b/sysom_server/sysom_vul/manage.py +index e93d9d3..2265c76 100644 +--- a/sysom_server/sysom_vul/manage.py ++++ b/sysom_server/sysom_vul/manage.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + """Django's command-line utility for administrative tasks.""" + import os + import sys +-- +2.31.1 + diff --git a/node_modules.tar.gz b/node_modules.tar.gz index 25aba0ab116709816a82faf85c670a07c42af8fc..0dd9caabe5fa5ff1c0fbab4162969ae225d90e99 100644 Binary files a/node_modules.tar.gz 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 index 3efbc60e96095ec99e24bd380d7d38a54eb1cd42..4a312dbbfb9ed38b96d7a51c1048dd55429bf9ff 100644 --- a/sysom.spec +++ b/sysom.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %define debug_package %{nil} Name: sysom @@ -18,13 +18,15 @@ URL: https://gitee.com/anolis/sysom BuildArch: x86_64 +Patch1001: 1001-change-to-python3.patch + %description SysOM is committed to building an automatic operation and maintenance platform that integrates host management, configuration and deployment, monitoring and alarm, exception diagnosis, security audit and other functions %prep -%setup -q -n %{name}-%{version} +%autosetup -n %{name}-%{version} -p1 pushd sysom_web tar -xvf %{SOURCE1} pushd node_modules @@ -42,49 +44,29 @@ popd echo "build sysom end" %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 -p sysom_api %{buildroot}/usr/local/sysom/server/target -cp -r -p sysom_web/dist/* %{buildroot}/usr/local/sysom/server/target/sysom_web/ -cp -p tools/deploy/nginx.conf %{buildroot}/usr/local/sysom/server/conf/ -cp -p tools/deploy/sysom.conf %{buildroot}/usr/local/sysom/server/conf/ -cp -p tools/deploy/sysom.ini %{buildroot}/etc/supervisord.d/ -cp -p tools/deploy/sysom-server.service %{buildroot}/usr/lib/systemd/system/ -cp -a -p script/* %{buildroot}/usr/local/sysom/init_scripts/ -cp -p tools/deploy/task-service.ini %{buildroot}/etc/supervisord.d/ -cp -p tools/deploy/channel-service.ini %{buildroot}/etc/supervisord.d/ +mkdir -p %{buildroot}/%{_prefix}/local/sysom/server/target +cp -a sysom_server %{buildroot}/%{_prefix}/local/sysom/server/target +cp -a sysom_web/dist %{buildroot}/%{_prefix}/local/sysom/server/target/sysom_web +cp -a script %{buildroot}/%{_prefix}/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/sysom-server.service + +%dir %{_prefix}/local/sysom +%{_prefix}/local/sysom/ + +%pre %post -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 %{_prefix}/local/sysom/init_scripts/server/clear.sh %postun -systemctl stop sysom-server -sed -i '/sysom/d' /var/spool/cron/root -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 +rm -rf %{_prefix}/local/sysom %changelog -* Mon Aug 8 2022 huangtuquan - 2.0-1 +* Mon Jan 30 2023 happy_orange - 2.0-2 +- update the source code + +* Fri Dec 12 2022 huangtuquan - 2.0-1 - sysom server release 2.0