Tweak installation docs and playbook a bit

- Require Ansble 2.0+
- Python 3 is installed by default in 18.04
- Make installation docs a bit more explicit

Author: berkerpeksag

Vagrantfile

@@ -13,6 +13,7 @@ Vagrant.configure(2) do |config|
   end
   config.vm.provision "ansible" do |ansible|
     ansible.playbook = "provisioning/pythondotorg.yml"
+    ansible.compatibility_mode = "2.0"
     ansible.host_key_checking = false
   end
   config.ssh.insert_key = false

docs/source/install.rst

@@ -11,7 +11,7 @@ Here are two ways to hack on python.org:
 Easy setup using Vagrant
 ------------------------
 
-First, install Vagrant_ and Ansible_ on your machine.
+First, install Vagrant_ (2.0+) and Ansible_ (2.0+) on your machine.
 You should then be able to provision the Vagrant box.
 
 ::
@@ -21,7 +21,8 @@ You should then be able to provision the Vagrant box.
 The box will be provisioned with a latest Python 3.6 version, a virtual
 environment with all the requirements installed, and a database ready to use.
 
-Once this is done it's time to create some data and run the server::
+Once this is done it's time to create some data and start the development server
+for the first time::
 
     # SSH into the Vagrant box.
     $ vagrant ssh
@@ -36,8 +37,15 @@ Once this is done it's time to create some data and run the server::
     # Run the server.
     $ ./manage.py runserver 0.0.0.0:8000
 
-Now use your favorite browser to go to http://localhost:8001/.
-The admin pages can be found at http://localhost:8001/admin/.
+Now use your favorite browser to go to http://localhost:8001/. The admin pages
+can be found at http://localhost:8001/admin/. You can use your superuser
+credentials to log in to Django admin.
+
+You will only need to run the following two commands the next time you want to
+work on python.org::
+
+    $ vagrant ssh
+    $ ./manage.py runserver 0.0.0.0:8000
 
 .. _Vagrant: https://www.vagrantup.com/downloads.html
 .. _Ansible: https://docs.ansible.com/ansible/intro_installation.html
@@ -55,7 +63,8 @@ Then create a virtual environment::
 
     $ python3.6 -m venv venv
 
-And then you'll need to install dependencies::
+And then you'll need to install dependencies. You don't need to use ``pip3``
+inside a Python 3 virtual environment::
 
     $ pip install -r dev-requirements.txt
 
@@ -76,6 +85,9 @@ default. Run the following command to create a new database::
 
        $ sudo -u postgres createdb pythondotorg -E utf-8 -l en_US.UTF-8
 
+   Note that this solution may not work if you've installed PostgreSQL via
+   Homebrew.
+
    If you get an error like this::
 
        createdb: database creation failed: ERROR:  new collation (en_US.UTF-8) is incompatible with the collation of the template database (en_GB.UTF-8)
@@ -88,7 +100,7 @@ To change database configuration, you can add the following setting to
 variable)::
 
     DATABASES = {
-        'default': dj_database_url.parse('postgres:///your_database_name')
+        'default': dj_database_url.parse('postgres:///your_database_name'),
     }
 
 If you prefer to use a simpler setup for your database you can use SQLite.

provisioning/pythondotorg.yml

@@ -18,7 +18,6 @@
         - libpq-dev
         - lib32z1-dev
         - git
-        - python3
         - python3-dev
         - python3-setuptools
         - python3-pip
@@ -76,7 +75,7 @@
            clone=no
            update=no
 
-    - name: Install packages required by the Django app inside virtualenv
+    - name: Install dependencies for the Django app inside virtual environment
       pip: virtualenv={{ project.virtualenv }}
            virtualenv_command="/usr/bin/python3 -m venv"
            requirements={{ project.requirements }}
@@ -88,7 +87,7 @@
       register: result
       changed_when: "result.rc is defined and result.stderr is defined and result.rc != 0 or result.stderr != ''"
 
-    - name: Install database migrations
+    - name: Apply database migrations
       django_manage: command=migrate
                      app_path={{ project.path }}
                      virtualenv={{ project.virtualenv }}