From 5e6bc6793f1f8911ca35b4ea0fbe9957bab9afdb Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Thu, 17 Jan 2019 15:32:40 +0100 Subject: [PATCH 1/6] Add link to the installer's documentation --- docs/en/getting_started/servers.md | 3 +++ docs/es/getting_started/servers.md | 3 +++ 2 files changed, 6 insertions(+) diff --git a/docs/en/getting_started/servers.md b/docs/en/getting_started/servers.md index b57c7bfa8..70fe51c50 100644 --- a/docs/en/getting_started/servers.md +++ b/docs/en/getting_started/servers.md @@ -17,3 +17,6 @@ - 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/getting_started/servers.md b/docs/es/getting_started/servers.md index dece6586c..4f0b7d8c7 100644 --- a/docs/es/getting_started/servers.md +++ b/docs/es/getting_started/servers.md @@ -17,3 +17,6 @@ - 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) From 42bc76a8b1e09cf963e860e7e5cd80f81acff142 Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Thu, 17 Jan 2019 15:33:17 +0100 Subject: [PATCH 2/6] Add recommendations for the different environments --- docs/en/SUMMARY.md | 1 + docs/en/getting_started/introduction.md | 11 +++++++++++ docs/es/SUMMARY.md | 1 + docs/es/getting_started/introduction.md | 11 +++++++++++ 4 files changed, 24 insertions(+) create mode 100644 docs/en/getting_started/introduction.md create mode 100644 docs/es/getting_started/introduction.md diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md index 1347a1fef..141e979c7 100644 --- a/docs/en/SUMMARY.md +++ b/docs/en/SUMMARY.md @@ -11,6 +11,7 @@ ### 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) 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/es/SUMMARY.md b/docs/es/SUMMARY.md index e039d2483..65675f953 100644 --- a/docs/es/SUMMARY.md +++ b/docs/es/SUMMARY.md @@ -10,6 +10,7 @@ ### 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) diff --git a/docs/es/getting_started/introduction.md b/docs/es/getting_started/introduction.md new file mode 100644 index 000000000..3989d4327 --- /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) e instalar CONSUL [en todo el sistema](https://consul_docs.gitbooks.io/docs/content/en/getting_started/prerequisites/). + +- Si tiene problemas para configurar CONSUL localmente en todo el sistema y desea mostrar CONSUL para fines de demostración, le recomendamos que utilice [Docker](https://consul_docs.gitbooks.io/docs/en/getting_started/docker.html) en un local máquina. + +- 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. From 744360e88d0ea6121833c6112452cb3112b2b5c9 Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Thu, 17 Jan 2019 15:33:45 +0100 Subject: [PATCH 3/6] Make distribution version requeriments more flexible --- docs/en/getting_started/servers.md | 6 +++--- docs/es/getting_started/servers.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/en/getting_started/servers.md b/docs/en/getting_started/servers.md index 70fe51c50..e335f5a94 100644 --- a/docs/en/getting_started/servers.md +++ b/docs/en/getting_started/servers.md @@ -1,16 +1,16 @@ -# 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 diff --git a/docs/es/getting_started/servers.md b/docs/es/getting_started/servers.md index 4f0b7d8c7..57385b0f7 100644 --- a/docs/es/getting_started/servers.md +++ b/docs/es/getting_started/servers.md @@ -1,16 +1,16 @@ # 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 From f4100e7be9c590eadd20067e1d46309468922e0d Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Thu, 17 Jan 2019 15:34:52 +0100 Subject: [PATCH 4/6] Restructure summany page --- docs/en/SUMMARY.md | 6 +++--- docs/es/SUMMARY.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md index 141e979c7..43fceed81 100644 --- a/docs/en/SUMMARY.md +++ b/docs/en/SUMMARY.md @@ -7,10 +7,8 @@ * [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) @@ -18,7 +16,9 @@ * [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/es/SUMMARY.md b/docs/es/SUMMARY.md index 65675f953..ed409542b 100644 --- a/docs/es/SUMMARY.md +++ b/docs/es/SUMMARY.md @@ -9,7 +9,6 @@ * [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) @@ -18,6 +17,7 @@ * [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) +* [Docker](getting_started/docker.md) ### Personalización * [Introducción](customization/README.md) From b64eecbaad0233c536760887ddcf9d738c2e9277 Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Thu, 17 Jan 2019 15:35:02 +0100 Subject: [PATCH 5/6] Add link to heroku documentation for spanish --- docs/es/SUMMARY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/es/SUMMARY.md b/docs/es/SUMMARY.md index ed409542b..126f659b2 100644 --- a/docs/es/SUMMARY.md +++ b/docs/es/SUMMARY.md @@ -17,6 +17,7 @@ * [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 From a503c87f235097a41edbfd77026bf8ab3c0a3f8c Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Wed, 6 Feb 2019 13:14:44 +0100 Subject: [PATCH 6/6] Reword --- docs/es/getting_started/introduction.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/es/getting_started/introduction.md b/docs/es/getting_started/introduction.md index 3989d4327..18a513f0e 100644 --- a/docs/es/getting_started/introduction.md +++ b/docs/es/getting_started/introduction.md @@ -4,8 +4,8 @@ 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) e instalar CONSUL [en todo el sistema](https://consul_docs.gitbooks.io/docs/content/en/getting_started/prerequisites/). +- 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 tiene problemas para configurar CONSUL localmente en todo el sistema y desea mostrar CONSUL para fines de demostración, le recomendamos que utilice [Docker](https://consul_docs.gitbooks.io/docs/en/getting_started/docker.html) en un local máquina. +- 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.