Fix error when upgrading rpm package (order or script, solved with po…

…stTrans).
mnellemann · Feb 27, 2024 · ebdbdf1 · ebdbdf1
1 parent 157afad
commit ebdbdf1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.7] - 2024-02-27
+- Client: Move configuration options into configuration file - prep. for packaging
+- Server: Implement configuration file and move options into configuration file - prep. for packaging
+- Create systemd (Linux) or sysv (AIX) init scripts during installation when installing from .deb or .rpm
+
 ## [1.1.6] - 2024-01-31
 - Allow server to override timestamp from clients
 - Update 3rd party dependencies

diff --git a/client/build.gradle b/client/build.gradle
@@ -82,12 +82,6 @@ ospackage {
     user = 'root'
     packager = "Mark Nellemann <mark.nellemann@gmail.com>"
 
-    os Os.LINUX
-
-    installUtils file('scripts/shared.sh')
-    postInstall file('scripts/install.sh')
-    preUninstall file('scripts/remove.sh')
-
     into '/opt/sysmon/client'
 
     from(shadowJar.outputs.files) {
@@ -110,8 +104,16 @@ ospackage {
 
 buildDeb {
     dependsOn startShadowScripts
+    installUtils file('scripts/shared.sh')
+    preUninstall file('scripts/remove.sh')
+    postInstall file('scripts/install.sh')
 }
 
 buildRpm {
     dependsOn startShadowScripts
+    installUtils file('scripts/shared.sh')
+    preUninstall file('scripts/remove.sh')
+    postTrans file('scripts/install.sh')
+    os Os.LINUX
 }
+
diff --git a/gradle.properties b/gradle.properties
@@ -1,10 +1,10 @@
-version         = 1.1.6
+version         = 1.1.7
 pf4jVersion     = 3.10.0
 slf4jVersion    = 2.0.9
 camelVersion    = 3.14.10
 groovyVersion   = 3.0.20
 picocliVersion  = 4.7.5
-oshiVersion     = 6.4.11
+oshiVersion     = 6.4.13
 spockVersion    = 2.3-groovy-3.0
 tomljVersion    = 1.1.1
 osPackageVersion = 11.8.1

diff --git a/plugins/build.gradle b/plugins/build.gradle
@@ -89,7 +89,6 @@ ospackage {
     release = '1'
     user = 'root'
     packager = "Mark Nellemann <mark.nellemann@gmail.com>"
-    os Os.LINUX
 
     into '/opt/sysmon/plugins'
 
@@ -107,6 +106,7 @@ buildDeb {
 buildRpm {
     subprojects.each { dependsOn("${it.name}:build") }
     requires('sysmon-client', version, GREATER | EQUAL)
+    os Os.LINUX
 }
 
 task buildZip(type: Zip) {

diff --git a/server/build.gradle b/server/build.gradle
@@ -46,11 +46,6 @@ ospackage {
     release = '1'
     user = 'root'
     packager = "Mark Nellemann <mark.nellemann@gmail.com>"
-    os Os.LINUX
-
-    installUtils file('scripts/shared.sh')
-    postInstall file('scripts/install.sh')
-    preUninstall file('scripts/remove.sh')
 
     into '/opt/sysmon/server'
 
@@ -74,10 +69,18 @@ ospackage {
 
 buildDeb {
     dependsOn startShadowScripts
+    installUtils file('scripts/shared.sh')
+    preUninstall file('scripts/remove.sh')
+    postInstall file('scripts/install.sh')
+
 }
 
 buildRpm {
     dependsOn startShadowScripts
+    installUtils file('scripts/shared.sh')
+    preUninstall file('scripts/remove.sh')
+    postTrans file('scripts/install.sh')
+    os Os.LINUX
 }
 
 jar {