no bug - Update README and VS Code tasks for morbo dev server

Updates the readme to let new users know that they have to run
`start_morbo` before they can visit bmo-web.vm.

Also updates the VS Code tasks to work again.

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 160a859dc1b11834e71fc9e99ffa6d4c71b5667d..2cd4907abf4b4f4f3ffd6f9a20f95b0b2ab19151 100644 (file)
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,23 +4,30 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "Vagrant: Start Local Server",
+      "label": "Vagrant: Start VM",
       "type": "shell",
       "command": "vagrant up",
       "group": "none",
       "problemMatcher": []
     },
     {
-      "label": "Vagrant: Suspend Local Server",
+      "label": "Vagrant: Suspend VM",
       "type": "shell",
       "command": "vagrant suspend",
       "group": "none",
       "problemMatcher": []
     },
     {
-      "label": "Vagrant: Update Local Server",
+        "label": "Vagrant: Start Web Server",
+        "type": "shell",
+        "command": "vagrant ssh web -c 'start_morbo'",
+        "group": "none",
+        "problemMatcher": []
+    },
+    {
+      "label": "Vagrant: Update Web Server",
       "type": "shell",
-      "command": "bash -c 'vagrant rsync && vagrant provision --provision-with update'",
+      "command": "vagrant rsync web",
       "group": {
         "kind": "build",
         "isDefault": true
@@ -28,9 +35,9 @@
       "problemMatcher": []
     },
     {
-      "label": "Vagrant: Force Update Local Server",
+      "label": "Vagrant: Force Update VM",
       "type": "shell",
-      "command": "bash -c 'vagrant rsync && vagrant provision'",
+      "command": "vagrant rsync && vagrant provision",
       "group": "build",
       "problemMatcher": []
     },

diff --git a/README.rst b/README.rst
index e19bc274e4823265f5a298bf4b8aec23dd2b01ff..b47aa1d561fa012aeda4d813fcdbf78feb240ac6 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -50,7 +50,8 @@ From your BMO checkout run the following command:
 
     vagrant up
 
-Depending on the speed of your computer and your Internet connection, this
+Vagrant might ask to install some missing plugins it detected, you should install these.
+Depending on the speed of your computer and your Internet connection, this entire process
 will take from a few minutes to much longer.
 
 If this fails, please file a bug `using this link <https://bugzilla.mozilla.org/enter_bug.cgi?assigned_to=nobody%40mozilla.org&bug_file_loc=http%3A%2F%2F&bug_ignored=0&bug_severity=normal&bug_status=NEW&cf_fx_iteration=---&cf_fx_points=---&component=Developer%20Box&contenttypemethod=autodetect&contenttypeselection=text%2Fplain&defined_groups=1&flag_type-254=X&flag_type-4=X&flag_type-607=X&flag_type-791=X&flag_type-800=X&flag_type-803=X&form_name=enter_bug&maketemplate=Remember%20values%20as%20bookmarkable%20template&op_sys=Unspecified&priority=--&product=bugzilla.mozilla.org&rep_platform=Unspecified&target_milestone=---&version=Production>`__.
@@ -60,6 +61,8 @@ Otherwise, you should have a working BMO developer machine!
 To test it, you'll want to add an entry to /etc/hosts for bmo-web.vm pointing
 to 192.168.3.43.
 
+Then you must start the development webserver with ``vagrant ssh web -c 'start_morbo'``.
+
 After that, you should be able to visit http://bmo-web.vm/ from your browser.
 You can login as vagrant@bmo-web.vm with the password "vagrant01!" (without
 quotes).
@@ -71,7 +74,7 @@ After editing files in the bmo directory, you will need to run
 
 .. code-block:: bash
 
-    vagrant rsync && vagrant provision --provision-with update
+    vagrant rsync web
 
 to see the changes applied to your vagrant VM. If the above command fails
 or db is changed, do a full provision: