Merge pull request #39 from LUS24/master

Author: jslvtr

guides/DigitalOcean Tutorial.md

@@ -6,41 +6,55 @@ DigitalOcean is a cloud infrastructure provider focused on simplifying web infra
 
 ## Creating an account
 
-You can sign up to DigitalOcean using our affiliate link. Doing so gives you a starting credit of $10, which allows you to rent a server for 2 months. Click this link to create your account and get the $10: [https://m.do.co/c/d54c088544ed](https://m.do.co/c/d54c088544ed). If the link doesn't work, paste it into your browser.
+You can sign up to DigitalOcean using our affiliate link. Doing so gives you a starting credit of $100 to spend in 60 days. Click this link to create your account and get the $100: [https://m.do.co/c/d54c088544ed](https://m.do.co/c/d54c088544ed). If the link doesn't work, paste it into your browser.
 
 ![Create an account](assets/DigitalOcean/create_account.png)
 
-After clicking the link, you should see a page like the above. Create your account at the left-bottom corner and you'll receive the $10 automatically. Beware that you'll be asked to provide payment info when creating the account, since all services (which you'll choose below) in DigitalOcean will be charged after your credit runs out.
+After clicking the link, you should see a page like the above. Create your account at the left-bottom corner and you'll receive the $100 automatically. Beware that you'll be asked to provide payment info when creating the account, since all services (which you'll choose below) in DigitalOcean will be charged after your credit runs out.
 
 ## Creating a Droplet
 
 A server instance in DigitalOcean is called a `Droplet`. It's just a name that may vary in different platforms, for example, `Dyno` for `Heroku` and `EC2` for `AWS` (Amazon Web Service). Below are the steps to create a `Droplet`.
 
 ### Choosing an image
 
-To create a `Droplet`, we must first specify an image, that is, choosing what Operating System you want for the server. We recommend to use a Ubuntu LTS (Long Term Support) distribution. For more info on Ubuntu life time, please refer to the [official Ubuntu end of life page here](https://www.ubuntu.com/info/release-end-of-life). In our example, we'll use `Ubuntu 16.04.* x64`, which is an LTS distribution.
+To create a `Droplet`, we must first specify an image, that is, choosing what Operating System you want for the server. We recommend to use a Ubuntu LTS (Long Term Support) distribution. For more info on Ubuntu life time, please refer to the [official Ubuntu end of life page here](https://www.ubuntu.com/info/release-end-of-life). In our example, we'll use `Ubuntu 20.04 (LTS) x64`, which is an LTS distribution.
 
 ### Choosing a size
 
-Next, we need to choose the specs for our server. In this tutorial, we'll be using the most basic tier of a Standard `Droplet`, which offers a single CPU with 512MB RAM, 20GB SSD and 1000 GB transfer at $5 per month. Generally, it's more than enough for running personal applications. You may also run several services in a single Droplet.
+Next, we need to choose the specs for our server. In this tutorial, we'll be using the most basic tier of a Standard `Droplet`, which offers a single Regular Intel CPU with 1GB RAM, 25GB SSD and 1000 GB transfer at $5 per month. Generally, it's more than enough for running personal applications. You may also run several services in a single Droplet.
 
 ### Choosing a datacenter region
 
 Generally, choosing a region that's _closest to your users_ will make your service deliver faster. If your users are primarily in the United States, you could choose a United States-based Droplet.
 
 ### Other configurations
 
-In our example, we do not need to add any other services such as block storage or private network. So we will ignore these settings to keep our setup simple and cheap. You may choose to use `SSH` key or you can just leave it unchecked and a password will be generated for you. If you choose to use SSH key, then each time you want to login to the server, you will need to provide the key. Since you have to have access to the SSH key whenever you log in, it can be more secure or more troublesome depends on scenarios. At last, you may change the name of your `Droplet` to something you like and then click `Create` to create and launch your `Droplet`.
+In our example, we do not need to add any other services such as block storage or private network. So we will ignore these settings to keep our setup simple and cheap.  
+You may choose to use `SSH` key and follow the steps recommended by DigitalOcean or create a password.
 
-## Connecting to our droplet
+#### Setting up a password
 
-![DigitalOcean Access Console](assets/DigitalOcean/access_console.png)
+If you want to use a password you just have to select the __"Create a root password to access Droplet"__ and then insert a strong password which you can use to login remotely or through DigitalOcean's Droplet Console.
+
+#### Setting up an SSH key
+
+ If you choose to use SSH key, then each time you want to login to the server from outside DigitalOcean's site, you will need to provide the key. For example in windows using [GitBash terminal](https://git-scm.com/downloads) you need to add the `-i` option and pass the full path for the ssh-key file:
+
+```bash
+ssh root@insert-droplet-ip -i /c/Users/insert-username/.ssh/insert-ssh-key-filename
+```
 
-Once you've created your `Droplet`, you will receive an e-mail containing your login (`root`) and initial password for it. Now click the "Access Console" option in the dropdown menu associated with your `Droplet` as shown in above image.
+Be aware that this command will only work for the root user, if you want to add an ssh key for another user you can see the details in [DigitalOcean's docs](https://docs.digitalocean.com/products/droplets/how-to/add-ssh-keys/).
 
-## Change your password
+Since you have to have access to the SSH key whenever you log in, it can be more secure or more troublesome depending on the scenario.  
+At last, you may change the name of your `Droplet` to something you like and then click `Create` to create and launch your `Droplet`.
+
+## Connecting to our droplet
+
+![DigitalOcean Access Console](assets/DigitalOcean/access_console.png)
 
-Now you will be shown a console connected to your `Droplet`. Use the login `root` and the password received in your email to login. Then you will be ask to provide your password again and change it to a new password. Notice that all password field will not show any modification when you are typing. There is nothing wrong with your console, it's just a `UNIX` security feature. After changing your password, you are now logged in as the root user on your server.
+Once you've created your `Droplet` click the "Access Console" option in the dropdown menu associated with your `Droplet`, as shown in above image, and click the `Launch Droplet Console` button.
 
 If you have successfully followed the tutorial so far, then you have finished all the setting-ups that are specific to DigitalOcean. The following sections can serve as a standalone tutorial and can be applied to deployment onto any other platforms as well.
 

guides/How To Deploy Python App Using uWSGI And Nginx.md

@@ -62,85 +62,12 @@ passwd johndoe
 
 ## Providing user with additional privilege
 
-Since we will be logging in as `johndoe` for most of the time in the future, we will want it to have some "extra power", that is, temporarily acting as a super user. To do this, we need to run the command:
+Since we will be logging in as `johndoe` for most of the time in the future, we will want it to have some "extra power", that is, temporarily acting as a super user. To do this, we have to add the user to the sudoers group running the command:
 
 ```
-visudo
+usermod -aG sudo johndoe
 ```
 
-first, and we will see a text file popping up. Then we navigate to the lines containing:
-
-```
-# User privilege specification
-root ALL=(ALL:ALL) ALL
-```
-
-You can do this with the arrow keys. We need to add a new line for our user in this section:
-
-```
-# User privilege specification
-root ALL=(ALL:ALL) ALL
-johndoe ALL=(ALL:ALL) ALL
-```
-
-Remember that the `ALL` has to be **all uppercase**, otherwise it will raise syntax error.
-
-After adding this line, use `ctrl + o` to save and press `ENTER` to overwrite, then press `ctrl + x` to quit.
-
-## Enable SSH for our new user
-
-Next, we want to allow us to login as `johndoe` using SSH, and we may also want to disable login as `root` from SSH to make our server more secure. To do this, use the command:
-
-```
-vi /etc/ssh/sshd_config
-```
-
-And we will be prompted with another text file. Navigate to the section which contains:
-
-```
-# Authentication
-PermitRootLogin yes
-```
-
-Press `i` on your keyboard to enter insert mode and change the `yes` to `no` to disallow login as root.
-
-Next, look for a configuration called `PasswordAuthentication`:
-
-```
-# Change to no to disable tunnelled clear text passwords
-PasswordAuthentication yes
-```
-
- **Important:** make sure to set it as `yes` so that you can use your password to login in the future. It should be set to `yes` already, however, there are some platforms that enforces SSH key authentication and set it to `no` instead.
-
-Then go to the bottom of the file and add the following lines:
-
-```
-AllowUsers johndoe
-```
-
-For this section, if you already have other users on the server, make sure to include them as well. On AWS, for instance, a user named `ubuntu` is initialized and used to login for the first time. If you choose to create a new user, say `johndoe`, then you will need to add them together into `AllowUsers`:
-
-```
-AllowUsers johndoe ubuntu
-```
-
-Otherwise, you will no longer be able to login as `ubuntu` in the future.
-
-Next, press `Esc` to quit insert mode, press `:` (colon) to enable the command function and enter `wq` to write and quit (after hitting `ENTER` to confirm).
-
-Some other useful vi commands are: `:q` to quit without modification and `:q!` to force quit and discard changes.
-
-Finally, we use the command:
-
-```
-service sshd reload
-```
-
-to enable our modifications.
-
-Now we've created a new user `johndoe` and enabled both its super user privilege and SSH access. Next, we'll be learning to link this user to our PostgreSQL database.
-
 # Configuring Postgres
 
 Postgres allows from the start a user to access a database with its own name. Thus we must:
@@ -195,12 +122,18 @@ To quit Postgres:
 \q
 ```
 
+Change to user johndoe
+
+```
+su johndoe
+```
+
 ## Improve security on our PostgreSQL database
 
 However, notice that we've created a password for the Postgres user but never have to use it just because we used the same username in UNIX and Postgres. It is safer to require a password when connecting to the database. Use the below command to configure Postgres security options.
 
 ```
-sudo vi /etc/postgresql/9.5/main/pg_hba.conf
+sudo vi /etc/postgresql/12/main/pg_hba.conf
 ```
 
 Navigate to the bottom of the file, and we may see something like this:
@@ -244,7 +177,7 @@ In this section, we will pull our code from `GitHub`, which integrates a popular
 First, we create a folder called `items-rest` for our app, since our sample project is a REST API which manages items of stores. We create this folder using the following command:
 
 ```
-sudo mkdir /var/www/html/items-rest
+sudo mkdir -p /var/www/html/items-rest
 ```
 
 The folder is owned by the `root` user since we used `sudo` to create it. We need to transfer ownership to our current user:
@@ -279,16 +212,16 @@ sudo apt-get install python3-pip python3-dev libpq-dev
 Next, we will install `virtualenv`, which is a python library used to create virtual environment. Since we may want to deploy several services on one server in the future, using virtual environment allows us to create independent environment for each project so that their dependencies won't affect each other. We may install `virtualenv` using the following command:
 
 ```
-pip install virtualenv
+sudo pip install virtualenv
 ```
 
 After it is installed, we can create a `virtualenv`:
 
 ```
-virtualenv venv --python=python3.8.5
+virtualenv venv --python=python3.8
 ```
 
-Note that `Ubuntu` usually comes with `Python3.8.5` and it is what we used in the sample code, if you choose to use different versions of `Python`, feel free to change it accordingly and it will be the Python version inside your `virtualenv`.
+Note that `Ubuntu 20.04` usually comes with `Python3.8` and it is what we used in the sample code, if you choose to use different versions of `Python`, feel free to change it accordingly and it will be the Python version inside your `virtualenv`.
 
 To activate `virtualenv`: