JAMES-2587 update scripts
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4b329794 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4b329794 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4b329794 Branch: refs/heads/master Commit: 4b3297940e2c8a27353178d71c35589f3fd7a612 Parents: 694489f Author: tran tien duc <dt...@linagora.com> Authored: Fri Nov 9 14:22:23 2018 +0700 Committer: tran tien duc <dt...@linagora.com> Committed: Fri Nov 9 14:22:23 2018 +0700 ---------------------------------------------------------------------- dockerfiles/packaging/guice/cassandra/scripts/james.postinst | 1 + dockerfiles/packaging/guice/cassandra/scripts/james.postremove | 1 + dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst | 1 + .../packaging/guice/cassandra/scripts/james.rpm.postremove | 1 + dockerfiles/packaging/guice/cassandra/scripts/james.service | 4 ++-- dockerfiles/packaging/guice/cassandra/scripts/james.service.rhel | 4 ++-- 6 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/4b329794/dockerfiles/packaging/guice/cassandra/scripts/james.postinst ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/scripts/james.postinst b/dockerfiles/packaging/guice/cassandra/scripts/james.postinst index a9cbe80..a03cd9c 100644 --- a/dockerfiles/packaging/guice/cassandra/scripts/james.postinst +++ b/dockerfiles/packaging/guice/cassandra/scripts/james.postinst @@ -4,6 +4,7 @@ ln -s /etc/james /var/lib/james/conf update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-ldap-server.jar 10 update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-withoutldap-server.jar 20 +update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-rabbitmq-withoutldap-server.jar 30 systemctl enable james http://git-wip-us.apache.org/repos/asf/james-project/blob/4b329794/dockerfiles/packaging/guice/cassandra/scripts/james.postremove ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/scripts/james.postremove b/dockerfiles/packaging/guice/cassandra/scripts/james.postremove index 29fc7fc..bde6eb2 100644 --- a/dockerfiles/packaging/guice/cassandra/scripts/james.postremove +++ b/dockerfiles/packaging/guice/cassandra/scripts/james.postremove @@ -2,3 +2,4 @@ update-alternatives --remove james /usr/share/james/james-ldap-server.jar update-alternatives --remove james /usr/share/james/james-withoutldap-server.jar +update-alternatives --remove james /usr/share/james/james-rabbitmq-withoutldap-server.jar http://git-wip-us.apache.org/repos/asf/james-project/blob/4b329794/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst b/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst index 3fde16c..2030e95 100644 --- a/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst +++ b/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst @@ -4,6 +4,7 @@ ln -s /etc/james /var/lib/james/conf update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-ldap-server.jar 10 update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-withoutldap-server.jar 20 +update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-rabbitmq-withoutldap-server.jar 20 #Workaround waiting for https://github.com/jordansissel/fpm/issues/1163 to be released cp /usr/share/james/james.service /etc/systemd/system/ http://git-wip-us.apache.org/repos/asf/james-project/blob/4b329794/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postremove ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postremove b/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postremove index ed29fa9..aede41f 100644 --- a/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postremove +++ b/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postremove @@ -7,3 +7,4 @@ rm /etc/systemd/system/james.service update-alternatives --remove james /usr/share/james/james-ldap-server.jar update-alternatives --remove james /usr/share/james/james-withoutldap-server.jar +update-alternatives --remove james /usr/share/james/james-rabbitmq-withoutldap-server.jar http://git-wip-us.apache.org/repos/asf/james-project/blob/4b329794/dockerfiles/packaging/guice/cassandra/scripts/james.service ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/scripts/james.service b/dockerfiles/packaging/guice/cassandra/scripts/james.service index 2c55df6..f5ceddc 100644 --- a/dockerfiles/packaging/guice/cassandra/scripts/james.service +++ b/dockerfiles/packaging/guice/cassandra/scripts/james.service @@ -1,8 +1,8 @@ [Unit] Description=James stands for Java Apache Mail Enterprise Server! It has a modular architecture based on a rich set of modern and efficient components which provides at the end complete, stable, secure and extendable Mail Servers running on the JVM. Documentation=http://james.apache.org -Wants=network-online.target cassandra.service elasticsearch.service -After=network-online.target cassandra.service elasticsearch.service +Wants=network-online.target cassandra.service elasticsearch.service rabbitmq.service +After=network-online.target cassandra.service elasticsearch.service rabbitmq.service [Service] Environment=WORKING_DIRECTORY=/var/lib/james http://git-wip-us.apache.org/repos/asf/james-project/blob/4b329794/dockerfiles/packaging/guice/cassandra/scripts/james.service.rhel ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/scripts/james.service.rhel b/dockerfiles/packaging/guice/cassandra/scripts/james.service.rhel index af48a62..d5efad5 100644 --- a/dockerfiles/packaging/guice/cassandra/scripts/james.service.rhel +++ b/dockerfiles/packaging/guice/cassandra/scripts/james.service.rhel @@ -1,8 +1,8 @@ [Unit] Description=James stands for Java Apache Mail Enterprise Server! It has a modular architecture based on a rich set of modern and efficient components which provides at the end complete, stable, secure and extendable Mail Servers running on the JVM. Documentation=http://james.apache.org -Wants=network-online.target cassandra.service elasticsearch.service -After=network-online.target cassandra.service elasticsearch.service +Wants=network-online.target cassandra.service elasticsearch.service rabbitmq.service +After=network-online.target cassandra.service elasticsearch.service rabbitmq.service [Service] Environment=WORKING_DIRECTORY=/var/lib/james --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
