From c0961cdd4df733c11ba14f703f9725d79bbe3178 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 10 Nov 2020 11:29:37 +0100 Subject: [PATCH] Improve RPM packaging. --- dep/org.argeo.dep.cms.client/pom.xml | 2 +- .../base/share/argeo/selinux/README.txt | 2 -- .../base/share/argeo/selinux/argeoctl.pp | Bin 951 -> 0 bytes .../base/share/argeo/selinux/argeoctl.te | 11 -------- dist/argeo-node/pom.xml | 2 +- .../rpm/usr/lib/systemd/system/argeo@.service | 26 ++++++++++-------- dist/osgi-boot/pom.xml | 6 ++-- org.argeo.core/bnd.bnd | 1 + pom.xml | 2 +- 9 files changed, 22 insertions(+), 30 deletions(-) delete mode 100644 dist/argeo-node/base/share/argeo/selinux/README.txt delete mode 100644 dist/argeo-node/base/share/argeo/selinux/argeoctl.pp delete mode 100644 dist/argeo-node/base/share/argeo/selinux/argeoctl.te diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml index 10b0eb97f..c2fcd54a3 100644 --- a/dep/org.argeo.dep.cms.client/pom.xml +++ b/dep/org.argeo.dep.cms.client/pom.xml @@ -292,7 +292,7 @@ argeo-cms-client-tp - osgi-boot + argeo-osgi-boot diff --git a/dist/argeo-node/base/share/argeo/selinux/README.txt b/dist/argeo-node/base/share/argeo/selinux/README.txt deleted file mode 100644 index de246fa23..000000000 --- a/dist/argeo-node/base/share/argeo/selinux/README.txt +++ /dev/null @@ -1,2 +0,0 @@ -# In order to use the argeo@ systemd services, first execute: -semodule -i /usr/share/argeo/selinux/argeoctl.pp \ No newline at end of file diff --git a/dist/argeo-node/base/share/argeo/selinux/argeoctl.pp b/dist/argeo-node/base/share/argeo/selinux/argeoctl.pp deleted file mode 100644 index 2dd583ec2e1bc244468d151b126dcf1bb5da8612..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 951 zcmbu7O-{ow5QRfQ{H#FY0zCnO8+gO6tT=#`wx%*ziDbDI3$B1TFDsa@?E@>2RiE@c zZ)Tn+mNFk-Z=Xj^)4(g^yXBV_AMdBL*sWiu5B+kT!o*6~Mr`LsKy33W^ox>?P2b(z zItxQ+x~`Ek4uaIZ_@|h{nQ3~fP})-RiAgLuw99$~8uat$uqZyeZMHkcv@CUBPdK$E zTHnCyIQEELEWTV=CWl_&WU;tuvrlpEOI7<<4u@b;4ej>SM|c`=+w=Dzhw>>>tD)Ka zpdnmUKts(@q$W5MP(970CO8R;W19Q);GwgaAvg((W4f{&BzZR*t?ebRNlz;}sd{Ku SZnswT4OZ-Djp~Ng|KJ argeo-cms-node - osgi-boot + argeo-osgi-boot diff --git a/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service b/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service index c2fc366ca..b310048e1 100644 --- a/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service +++ b/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service @@ -12,17 +12,21 @@ CacheDirectory=argeo.d/%I WorkingDirectory=/var/lib/argeo.d/%I ExecStart=/usr/lib/jvm/jre-11/bin/java \ - -Dlog4j.configuration="file:/etc/argeo.d/log4j.properties" \ - -Dosgi.configuration.cascaded=true \ - -Dosgi.sharedConfiguration.area=/usr/share/argeo \ - -Dosgi.sharedConfiguration.area.readOnly=true \ - -Dargeo.node.repo.indexesBase=/var/cache/argeo.d/%I/indexes \ - @/usr/share/osgi/boot/framework.args \ - @/etc/argeo.d/jvm.args \ - @/etc/argeo.d/%I/jvm.args \ - -configuration /var/lib/argeo.d/%I/state \ - -data /var/lib/argeo.d/%I/data -#ExecReload=/usr/sbin/argeoctl reload %I +-Dosgi.configuration.cascaded=true \ +-Dosgi.sharedConfiguration.area=/etc/argeo.d/%I \ +-Dosgi.sharedConfiguration.area.readOnly=true \ +-Dargeo.node.repo.indexesBase=/var/cache/argeo.d/%I/indexes \ +-Dorg.osgi.framework.bootdelegation=com.sun.jndi.ldap,com.sun.jndi.ldap.sasl,com.sun.security.jgss,com.sun.jndi.dns,com.sun.nio.file,com.sun.nio.sctp \ +-Declipse.ignoreApp=true \ +-Dosgi.noShutdown=true \ +-Dorg.eclipse.equinox.http.jetty.autostart=false \ +-Dosgi.bundles=org.argeo.osgi.boot@start \ +@/usr/share/osgi/boot/framework.args \ +@/usr/share/argeo/jvm.args \ +@/etc/argeo.d/jvm.args \ +@/etc/argeo.d/%I/jvm.args \ +-configuration /var/lib/argeo.d/%I/state \ +-data /var/lib/argeo.d/%I/data # Exit codes of the JVM when SIGTERM or SIGINT have been caught: SuccessExitStatus=143 130 diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml index a2ad00a6b..713f302ed 100644 --- a/dist/osgi-boot/pom.xml +++ b/dist/osgi-boot/pom.xml @@ -69,7 +69,7 @@ rpm - osgi-boot + argeo-osgi-boot /usr/bin @@ -117,7 +117,7 @@ - osgi-boot-equinox + argeo-osgi-boot-equinox @@ -141,7 +141,7 @@ rpm - osgi-boot-equinox + argeo-osgi-boot-equinox ${version.argeo-tp} ${maven.build.timestamp} diff --git a/org.argeo.core/bnd.bnd b/org.argeo.core/bnd.bnd index 469d8e286..f096e4f29 100644 --- a/org.argeo.core/bnd.bnd +++ b/org.argeo.core/bnd.bnd @@ -5,4 +5,5 @@ org.apache.jackrabbit.spi,\ org.apache.jackrabbit.spi2dav,\ org.apache.jackrabbit.spi2davex,\ org.apache.jackrabbit.webdav,\ +junit.*;resolution:=optional,\ * \ No newline at end of file diff --git a/pom.xml b/pom.xml index fbc2d287f..f140e208a 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 2.1.27 7 - /srv/rpmfactory/argeo-osgi-2/el7 + /srv/rpmfactory/argeo-osgi-2/argeo code.argeo.org -- 2.30.2