diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md index 1347a1fef..43fceed81 100644 --- a/docs/en/SUMMARY.md +++ b/docs/en/SUMMARY.md @@ -7,17 +7,18 @@ * [Configure your fork](forks/configuration.md) * [Keep your fork updated](forks/update.md) * [Communication](forks/communication.md) -* [Manual deployment to Heroku](getting_started/deploying-on-heroku.md) ### Installation -* [Docker](getting_started/docker.md) +* [Introduction](getting_started/introduction.md) * [Prerequisites](getting_started/prerequisites/README.md) * [Linux](getting_started/prerequisites/linux.md) * [macOS](getting_started/prerequisites/macos.md) * [Windows](getting_started/prerequisites/windows.md) * [Local installation](getting_started/local_installation.md) * [Development Mail Server](getting_started/dev_mailserver.md) -* [Production and Test servers](getting_started/servers.md) +* [Production and Staging servers](getting_started/servers.md) +* [Heroku](getting_started/deploying-on-heroku.md) +* [Docker](getting_started/docker.md) ### Customization * [Introduction](customization/introduction.md) diff --git a/docs/en/getting_started/introduction.md b/docs/en/getting_started/introduction.md new file mode 100644 index 000000000..a7e7516da --- /dev/null +++ b/docs/en/getting_started/introduction.md @@ -0,0 +1,11 @@ +# Introduction + +These are our recommendations for the different environments and purposes: + +- To setup CONSUL for a production environment we recommend using the [installer](https://github.com/consul/installer). + +- For developers working on a CONSUL fork we recommend using a UNIX based system (Linux or Mac) and installing CONSUL [locally system wide](https://consul_docs.gitbooks.io/docs/content/en/getting_started/prerequisites/). + +- If you run into problems configuring CONSUL locally system wide and would like to show CONSUL for demo purposes we recommend using [Docker](https://consul_docs.gitbooks.io/docs/en/getting_started/docker.html) in a local machine. + +- We also have a [Heroku guide](https://consul_docs.gitbooks.io/docs/content/en/getting_started/deploying-on-heroku.html) which can be used for demo purposes in a remote server. diff --git a/docs/en/getting_started/servers.md b/docs/en/getting_started/servers.md index b57c7bfa8..e335f5a94 100644 --- a/docs/en/getting_started/servers.md +++ b/docs/en/getting_started/servers.md @@ -1,19 +1,22 @@ -# Production and Test servers +# Production and Staging servers ## Recommended Minimum System Requirements: ### 1. Production Server: - - Distrubution: Ubuntu 16.04.3 + - Distrubution: Ubuntu 16.04.X - RAM: 32GB - Processor: Quad core - Hard Drive: 20 GB - Database: Postgres ### 2. Staging Server: - - Distrubution: Ubuntu 16.04.3 + - Distrubution: Ubuntu 16.04.X - RAM: 16GB - Processor: Dual core - Hard Drive: 20 GB - Database: Postgres If your city has a population of over 1.000.000, consider balancing your load using 2-3 production servers and a separate server for the database. + +## Installation notes +Check out the [installer's README](https://github.com/consul/installer) diff --git a/docs/es/SUMMARY.md b/docs/es/SUMMARY.md index e039d2483..126f659b2 100644 --- a/docs/es/SUMMARY.md +++ b/docs/es/SUMMARY.md @@ -9,7 +9,7 @@ * [Comunicación](forks/communication.md) ### Instalación -* [Docker](getting_started/docker.md) +* [Introducción](getting_started/introduction.md) * [Prerrequisitos](getting_started/prerequisites/README.md) * [Linux](getting_started/prerequisites/linux.md) * [macOS](getting_started/prerequisites/macos.md) @@ -17,6 +17,8 @@ * [Instalación local](getting_started/local_installation.md) * [Servidor local de correo](getting_started/dev_mailserver.md) * [Servidores de prueba y producción](getting_started/servers.md) +* [Heroku](getting_started/deploying-on-heroku.md) +* [Docker](getting_started/docker.md) ### Personalización * [Introducción](customization/README.md) diff --git a/docs/es/getting_started/introduction.md b/docs/es/getting_started/introduction.md new file mode 100644 index 000000000..18a513f0e --- /dev/null +++ b/docs/es/getting_started/introduction.md @@ -0,0 +1,11 @@ +# Introducción + +Estas son nuestras recomendaciones para los diferentes entornos y propósitos: + +- Para configurar CONSUL para un entorno de producción, recomendamos utilizar el [instalador](https://github.com/consul/installer). + +- Para los programadores que trabajan en un entorno de desarrollo, recomendamos instalar CONSUL en un sistema basado en UNIX (Linux o Mac) y hacer una [instalación local](https://consul_docs.gitbooks.io/docs/content/en/getting_started/prerequisites/) de CONSUL. + +- Si tienes problemas para hacer una instalación local y deseas mostrar CONSUL para fines de demostración, te recomendamos que utilices [Docker](https://consul_docs.gitbooks.io/docs/en/getting_started/docker.html) en tu ordenador personal. + +- También tenemos una [Guía Heroku](https://consul_docs.gitbooks.io/docs/content/en/getting_started/deploying-on-heroku.html) que se puede utilizar para fines de demostración en un servidor remoto. diff --git a/docs/es/getting_started/servers.md b/docs/es/getting_started/servers.md index dece6586c..57385b0f7 100644 --- a/docs/es/getting_started/servers.md +++ b/docs/es/getting_started/servers.md @@ -1,19 +1,22 @@ # Servidores de prueba y producción -## Requisitos de Sistema mínimos recomendados: +## Requisitos de sistema mínimos recomendados: ### 1. Production Server: - - Distrubution: Ubuntu 16.04.3 + - Distrubution: Ubuntu 16.04.X - RAM: 32GB - Processor: Quad core - Hard Drive: 20 GB - Database: Postgres ### 2. Staging Server: - - Distrubution: Ubuntu 16.04.3 + - Distrubution: Ubuntu 16.04.X - RAM: 16GB - Processor: Dual core - Hard Drive: 20 GB - Database: Postgres Si tu ciudad tiene una población superior a 1.000.000, considera añadir un balanceador de carga y usar 2-3 servidores de producción, además de un servidor de base de datos dedicado. + +## Instrucciones de instalación +Se encuentran en el [repositorio del instalador](https://github.com/consul/installer)