This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 1ea434441fa7be11dcf8176e1eb20a52b11f69d2 Author: Benoit Tellier <[email protected]> AuthorDate: Wed Jun 23 11:38:45 2021 +0700 JAMES-3603 Fix some broken links --- .../markdown/server/install/guice-cassandra-rabbitmq-s3.md | 2 +- src/site/markdown/server/install/guice-cassandra.md | 2 +- src/site/markdown/server/install/guice-jpa.md | 2 +- src/site/markdown/server/manage-guice-distributed-james.md | 10 +++++----- src/site/xdoc/server/install.xml | 2 +- src/site/xdoc/server/quick-start-cassandra.xml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md b/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md index 17231be..84075ac 100644 --- a/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md +++ b/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md @@ -36,7 +36,7 @@ To run james, you have to create a directory containing required configuration f James requires the configuration to be in a subfolder of working directory that is called **conf**. You can get a sample directory for configuration from -[dockerfiles/run/guice/cassandra-rabbitmq/destination/conf](https://github.com/apache/james-project/tree/master/server/apps/distributed-app/guice/cassandra-rabbitmq/destination/conf). You might need to adapt it to your needs. +[server/apps/distributed-app/sample-configuration](https://github.com/apache/james-project/tree/master/server/apps/distributed-app/sample-configuration). You might need to adapt it to your needs. You also need to generate a keystore in your conf folder with the following command: diff --git a/src/site/markdown/server/install/guice-cassandra.md b/src/site/markdown/server/install/guice-cassandra.md index 140f250..8d31ec6 100644 --- a/src/site/markdown/server/install/guice-cassandra.md +++ b/src/site/markdown/server/install/guice-cassandra.md @@ -37,7 +37,7 @@ To run james, you have to create a directory containing required configuration f James requires the configuration to be in a subfolder of working directory that is called **conf**. You can get a sample directory for configuration from -[dockerfiles/run/guice/cassandra/destination/conf](https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra/destination/conf). You might need to adapt it to your needs. +[server/apps/cassandra-app/sample-configuration](https://github.com/apache/james-project/tree/master/server/apps/cassandra-app/sample-configuration). You might need to adapt it to your needs. You also need to generate a keystore in your conf folder with the following command: diff --git a/src/site/markdown/server/install/guice-jpa.md b/src/site/markdown/server/install/guice-jpa.md index a83e3e6..7616f53 100644 --- a/src/site/markdown/server/install/guice-jpa.md +++ b/src/site/markdown/server/install/guice-jpa.md @@ -28,7 +28,7 @@ mvn clean install To run james, you have to create a directory containing required configuration files. James requires the configuration to be in a subfolder of working directory that is called **conf**. You can get a sample -directory for configuration from [dockerfiles/run/guice/jpa/destination/conf](https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/jpa/destination/conf). You might need to adapt it to your needs. +directory for configuration from [server/apps/jpa-app/sample-configuration](https://github.com/apache/james-project/tree/master/server/apps/jpa-app/sample-configuration). You might need to adapt it to your needs. ## Running diff --git a/src/site/markdown/server/manage-guice-distributed-james.md b/src/site/markdown/server/manage-guice-distributed-james.md index a1bd770..d5d21ce 100644 --- a/src/site/markdown/server/manage-guice-distributed-james.md +++ b/src/site/markdown/server/manage-guice-distributed-james.md @@ -38,7 +38,7 @@ In order to achieve this goal, this product leverages the following technologies - **ElasticSearch** for search - **RabbitMQ** for messaging -A [docker-compose](https://github.com/apache/james-project/blob/master/dockerfiles/run/docker-compose.yml) file is +A [docker-compose](https://github.com/apache/james-project/blob/master/server/apps/distributed-app/docker-compose.yml) file is available to allow you to quickly deploy locally this product. ## Basic Monitoring @@ -185,7 +185,7 @@ allowing to do different kind of extra operations on the system, like: - ... It is possible for the administrator of James to define the mailbox listeners he wants to use, by adding them in the -[listeners.xml](https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/listeners.xml) configuration file. +[listeners.xml](https://github.com/apache/james-project/blob/master/server/apps/distributed-app/sample-configuration/listeners.xml) configuration file. It's possible also to add your own custom mailbox listeners. This enables to enhance capabilities of James as a Mail Delivery Agent. You can get more information about those [here](config-listeners.html). @@ -261,7 +261,7 @@ from the old index to the new one (this actively relies on `_source` field being - Now that the migration to the new index is done, you can [drop the old index](https://www.elastic.co/guide/en/elasticsearch/reference/6.3/indices-delete-index.html) - You might want as well modify the James configuration file -[elasticsearch.properties](https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/elasticsearch.properties) +[elasticsearch.properties](https://github.com/apache/james-project/blob/master/server/apps/distributed-app/sample-configuration/elasticsearch.properties) by setting the parameter `elasticsearch.index.mailbox.name` to the name of your new index. This is to avoid that James re-creates index upon restart @@ -594,11 +594,11 @@ To setup James with Deleted Messages Vault, you need to follow those steps: #### Enable Deleted Messages Vault by configuring Pre Deletion Hooks -You need to configure this hook in [listeners.xml](https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/listeners.xml) configuration file. More details about configuration & example can be found at [Pre Deletion Hook Configuration](http://james.apache.org/server/config-listeners.html) +You need to configure this hook in [listeners.xml](https://github.com/apache/james-project/blob/master/server/apps/distributed-app/sample-configuration/listeners.xml) configuration file. More details about configuration & example can be found at [Pre Deletion Hook Configuration](http://james.apache.org/server/config-listeners.html) #### Configuring the retention time for the Deleted Messages Vault -In order to configure the retention time for the Deleted Messages Vault, an administrator needs to perform fine configuration tunning as explained in [deletedMessageVault.properties](https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/deletedMessageVault.properties). Mails are not retained forever as you have to configure a retention period (by `retentionPeriod`) before using it (with one-year retention by default if not defined). +In order to configure the retention time for the Deleted Messages Vault, an administrator needs to perform fine configuration tunning as explained in [deletedMessageVault.properties](https://github.com/apache/james-project/blob/master/server/apps/distributed-app/sample-configuration/deletedMessageVault.properties). Mails are not retained forever as you have to configure a retention period (by `retentionPeriod`) before using it (with one-year retention by default if not defined). ### Restore deleted messages after deletion diff --git a/src/site/xdoc/server/install.xml b/src/site/xdoc/server/install.xml index 79e751e..5510f9e 100644 --- a/src/site/xdoc/server/install.xml +++ b/src/site/xdoc/server/install.xml @@ -89,7 +89,7 @@ <a href="install/jpa-guice.html">JPA-Guice</a> and <a href="install/jpa-smtp-guice.html">JPA-SMTP-Guice</a>. </p> - <p>A <a href="https://github.com/apache/james-project/blob/james-project-3.6.0/dockerfiles/run/docker-compose.yml";> + <p>A <a href="https://github.com/apache/james-project/blob/master/server/apps/distributed-app/docker-compose.yml";> docker-compose</a> is available for Guice + Cassandra + ElasticSearch + RabbitMQ</p> </section> diff --git a/src/site/xdoc/server/quick-start-cassandra.xml b/src/site/xdoc/server/quick-start-cassandra.xml index 61df784..3d197cb 100644 --- a/src/site/xdoc/server/quick-start-cassandra.xml +++ b/src/site/xdoc/server/quick-start-cassandra.xml @@ -83,7 +83,7 @@ Copy your TLS keys to ./conf/keystore or generate it using : You will have to put the keystore password in the right xml files (imapserver.xml, pop3server.xml, smtpserver.xml) -You are welcome to use the default configuration which can be found in the <i>$PWD/dockerfiles/run/guice/cassandra/destination/conf</i> folder. +You are welcome to use the default configuration which can be found in the <i>$PWD/server/apps/cassandra-app/sample-configuration</i> folder. Step 5: Start ############# @@ -205,7 +205,7 @@ Step 1: Download * Get the James docker-compose file -<i>$ wget https://raw.githubusercontent.com/apache/james-project/master/dockerfiles/run/docker-compose.yml</i> +<i>$ wget https://raw.githubusercontent.com/apache/james-project/master/server/apps/distributed-app/docker-compose.yml</i> Step 2: Start ############# --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
