Changes to services, use old install script

5 files changed, 21 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9be97d3d90ce..d62a7dff06d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cellframe-node-debug
 	pkgdesc = Cellframe blockchain node with a powerful SDK
 	pkgver = 5.2.490
-	pkgrel = 2
+	pkgrel = 3
 	url = https://cellframe.net
 	install = cellframe-node.install
 	arch = x86_64
@@ -29,14 +29,14 @@ pkgbase = cellframe-node-debug
 	source = cellframe-node-logrotate.timer
 	source = cellframe-node.service
 	source = cellframe-node.asan.service
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
+	md5sums = 485f1111843276340b0f1faf87abc3d0
+	md5sums = 23343c3c8be3363a5ac2b78a85eb96dc
+	md5sums = 6d8313251c773f8e8d2bce61636da94b
+	md5sums = db753282b4e1647387fab277598c79ca
 	md5sums = 6a52220e0b285dc9e803082f36897ad4
 	md5sums = 7c1087eea7336d99c4af55119673b009
 	md5sums = 47edb0d55d537e72f3de07ec6a72ea78
-	md5sums = 72472d529b38f06a78f37ac659b18d65
-	md5sums = 42a6fdb6b79a93d0a31dd33a40456c9c
+	md5sums = d1468c5407f058d7d7c7881ef8f74516
+	md5sums = ab49514b2af5b0f9dc3ff156bb768f93
 
 pkgname = cellframe-node-debug
diff --git a/PKGBUILD b/PKGBUILD
index 5f1c30d786a8..8981318255f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=cellframe-node-debug
 _pkgname=cellframe-node
 pkgver=5.2.490
-pkgrel=2
+pkgrel=3
 pkgdesc="Cellframe blockchain node with a powerful SDK"
 arch=('x86_64' 'aarch64')
 url="https://cellframe.net"
@@ -19,15 +19,15 @@ source=(git+https://gitlab.demlabs.net/cellframe/$_pkgname.git#commit=4a230d2f14
 		cellframe-node-logrotate.timer
 		cellframe-node.service
 		cellframe-node.asan.service)
-md5sums=('SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
+md5sums=('485f1111843276340b0f1faf87abc3d0'
+         '23343c3c8be3363a5ac2b78a85eb96dc'
+         '6d8313251c773f8e8d2bce61636da94b'
+         'db753282b4e1647387fab277598c79ca'
          '6a52220e0b285dc9e803082f36897ad4'
          '7c1087eea7336d99c4af55119673b009'
          '47edb0d55d537e72f3de07ec6a72ea78'
-         '72472d529b38f06a78f37ac659b18d65'
-         '42a6fdb6b79a93d0a31dd33a40456c9c')
+         'd1468c5407f058d7d7c7881ef8f74516'
+         'ab49514b2af5b0f9dc3ff156bb768f93')
 install=$_pkgname.install
 conflicts=(cellframe-dashboard cellframe-wallet cellframe-node)
 options=(!strip !debug)
diff --git a/cellframe-node.asan.service b/cellframe-node.asan.service
index 4f35ebb31a09..e7b982f02d4e 100644
--- a/cellframe-node.asan.service
+++ b/cellframe-node.asan.service
@@ -16,6 +16,7 @@ StandardOutput=null
 StandardError=journal
 CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_IPC_LOCK CAP_KILL CAP_LEASE CAP_MKNOD CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYS_RAWIO CAP_SYSLOG CAP_WAKE_ALARM CAP_SYS_RESOURCE CAP_DAC_READ_SEARCH
 Environment="ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:detect_invalid_pointer_pairs=2:debug=1:atexit=1:abort_on_error=1:log_path=asanlog.txt"
+OOMScoreAdjust=-900
 
 [Install]
 WantedBy=multi-user.target
diff --git a/cellframe-node.install b/cellframe-node.install
index fac9eecc3ea0..aa58000ecbe3 100644
--- a/cellframe-node.install
+++ b/cellframe-node.install
@@ -69,17 +69,16 @@ post_install() {
 }
 
 post_upgrade() {
-    echo "==> Reloading systemd unit files..."
     systemctl daemon-reload
-    systemctl is-active --quiet cellframe-node.service && systemctl restart cellframe-node.service && echo "==> Restarted cellframe-node.service"
+    systemctl is-active --quiet cellframe-node.service && systemctl restart cellframe-node.service
     showmsg
 }
 
 pre_remove() {
-    systemctl is-active --quiet cellframe-node.service && systemctl stop cellframe-node.service && echo "==> Stopped cellframe-node.service"
-    systemctl is-active --quiet cellframe-node-logrotate.timer && systemctl stop cellframe-node-logrotate.timer && echo "==> Stopped cellframe-node-logrotate.timer"
-    systemctl is-enabled --quiet cellframe-node.service && systemctl disable cellframe-node.service && "==> Disabled cellframe-node.service"
-    systemctl is-enabled --quiet cellframe-node-logrotate.timer && systemctl disable cellframe-node-logrotate.timer && "==> Disabled cellframe-node-logrotate.timer"
+    systemctl is-active --quiet cellframe-node.service && systemctl stop cellframe-node.service
+    systemctl is-active --quiet cellframe-node-logrotate.timer && systemctl stop cellframe-node-logrotate.timer
+    systemctl is-enabled --quiet cellframe-node.service && systemctl disable cellframe-node.service
+    systemctl is-enabled --quiet cellframe-node-logrotate.timer && systemctl disable cellframe-node-logrotate.timer
     systemctl daemon-reload
 }
 
diff --git a/cellframe-node.service b/cellframe-node.service
index 74f03648ed9f..d80a82185de3 100644
--- a/cellframe-node.service
+++ b/cellframe-node.service
@@ -15,6 +15,7 @@ LogNamespace=cellframe
 StandardOutput=null
 StandardError=journal
 CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_IPC_LOCK CAP_KILL CAP_LEASE CAP_MKNOD CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYS_RAWIO CAP_SYSLOG CAP_WAKE_ALARM CAP_SYS_RESOURCE CAP_DAC_READ_SEARCH
+OOMScoreAdjust=-900
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file