From 505d51db62ea28b26b7f48606d9ae163f94e78ce Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 13 Feb 2012 11:03:37 +0000 Subject: [PATCH] Improve RPM git-svn-id: https://svn.argeo.org/slc/trunk@5062 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- dist/pom.xml | 30 ++++++++ dist/slc-maven/pom.xml | 77 +++++++++++++++++++ .../src/main/rpm/var/lib/slc/.m2/settings.xml | 30 ++++++++ dist/slc-maven/src/main/scripts/preremove | 4 + dist/slc/src/main/scripts/preinstall-5 | 8 +- dist/slc/src/main/scripts/preinstall-6 | 8 +- dist/slc/src/main/scripts/preremove-5 | 2 +- dist/slc/src/main/scripts/preremove-6 | 2 +- 8 files changed, 155 insertions(+), 6 deletions(-) create mode 100644 dist/slc-maven/pom.xml create mode 100644 dist/slc-maven/src/main/rpm/var/lib/slc/.m2/settings.xml create mode 100644 dist/slc-maven/src/main/scripts/preremove diff --git a/dist/pom.xml b/dist/pom.xml index 2f05fa731..f8e395022 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -13,5 +13,35 @@ SLC Distribution slc + slc-maven + + + rpmbuild + + + + maven-antrun-plugin + + + install + + run + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dist/slc-maven/pom.xml b/dist/slc-maven/pom.xml new file mode 100644 index 000000000..b12644bb5 --- /dev/null +++ b/dist/slc-maven/pom.xml @@ -0,0 +1,77 @@ + + 4.0.0 + + org.argeo.slc + dist + 0.13.1-SNAPSHOT + + org.argeo.slc.dist + slc-maven + pom + SLC Distribution Maven + + + org.argeo.slc.runtime + org.argeo.slc.support.maven + + + + + rpmbuild + + + + org.codehaus.mojo + rpm-maven-plugin + + + rpm-slc-maven + package + + rpm + + + slc-maven + 2011 Argeo + + + /usr/share/osgi + root + root + 644 + false + + + org.argeo.slc.runtime:org.argeo.slc.support.maven + + + + + /var/lib/slc/.m2 + slc + slc + 644 + false + + + src/main/var/lib/slc/.m2 + + + + + + src/main/scripts/preremove + + + slc + + + + + + + + + + \ No newline at end of file diff --git a/dist/slc-maven/src/main/rpm/var/lib/slc/.m2/settings.xml b/dist/slc-maven/src/main/rpm/var/lib/slc/.m2/settings.xml new file mode 100644 index 000000000..3957593bb --- /dev/null +++ b/dist/slc-maven/src/main/rpm/var/lib/slc/.m2/settings.xml @@ -0,0 +1,30 @@ + + + + slc-repo + SLC Repository + http://localhost:7080/org.argeo.slc.repo.webapp/maven + * + + + + + slc-repo + root + demo + + + localrepo + root + demo + + + localrepo.snapshots + root + demo + + + + diff --git a/dist/slc-maven/src/main/scripts/preremove b/dist/slc-maven/src/main/scripts/preremove new file mode 100644 index 000000000..cbeb21191 --- /dev/null +++ b/dist/slc-maven/src/main/scripts/preremove @@ -0,0 +1,4 @@ +if [ $1 = "0" ];then + APP=slc + rm -rf /var/lib/$APP/.m2/repository +fi diff --git a/dist/slc/src/main/scripts/preinstall-5 b/dist/slc/src/main/scripts/preinstall-5 index c51911ab2..b599581bb 100644 --- a/dist/slc/src/main/scripts/preinstall-5 +++ b/dist/slc/src/main/scripts/preinstall-5 @@ -1,8 +1,12 @@ if [ $1 = "1" ];then APP=%{name} - # create application user (EL5) - useradd -r --home-dir /var/lib/$APP --shell /sbin/nologin --create-home $APP + # check if user exists + /bin/id $APP 2>/dev/null + if [ $? -ne 0 ];then + # create application user (EL5) + useradd -r --home-dir /var/lib/$APP --shell /sbin/nologin --create-home $APP + fi # give read access to group on home chmod g+r /var/lib/$APP diff --git a/dist/slc/src/main/scripts/preinstall-6 b/dist/slc/src/main/scripts/preinstall-6 index 488dac319..15a4ef13d 100644 --- a/dist/slc/src/main/scripts/preinstall-6 +++ b/dist/slc/src/main/scripts/preinstall-6 @@ -1,8 +1,12 @@ if [ $1 = "1" ];then APP=%{name} - # create application user (EL6) - useradd --system --home-dir /var/lib/$APP --shell /sbin/nologin --user-group --create-home $APP + # check if user exists + /bin/id $APP 2>/dev/null + if [ $? -ne 0 ];then + # create application user (EL6) + useradd --system --home-dir /var/lib/$APP --shell /sbin/nologin --user-group --create-home $APP + fi # give read access to group on home chmod g+r /var/lib/$APP diff --git a/dist/slc/src/main/scripts/preremove-5 b/dist/slc/src/main/scripts/preremove-5 index c3c339b10..e5532dbc5 100644 --- a/dist/slc/src/main/scripts/preremove-5 +++ b/dist/slc/src/main/scripts/preremove-5 @@ -2,5 +2,5 @@ if [ $1 = "0" ];then #APP=%{name} => doesn't work APP=slc /sbin/chkconfig --del $APP - userdel $APP + #userdel $APP fi diff --git a/dist/slc/src/main/scripts/preremove-6 b/dist/slc/src/main/scripts/preremove-6 index c3c339b10..e5532dbc5 100644 --- a/dist/slc/src/main/scripts/preremove-6 +++ b/dist/slc/src/main/scripts/preremove-6 @@ -2,5 +2,5 @@ if [ $1 = "0" ];then #APP=%{name} => doesn't work APP=slc /sbin/chkconfig --del $APP - userdel $APP + #userdel $APP fi -- 2.39.2