This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 921f9f0 Clean up grammar.
921f9f0 is described below
commit 921f9f0338272b944dad51ac9d15843aec3ca691
Author: Sam Ruby <[email protected]>
AuthorDate: Tue Nov 26 08:14:31 2019 -0500
Clean up grammar.
---
SETUPMYMAC.MD | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/SETUPMYMAC.MD b/SETUPMYMAC.MD
index d9817c0..e704a98 100644
--- a/SETUPMYMAC.MD
+++ b/SETUPMYMAC.MD
@@ -1,6 +1,6 @@
If you have a MacBook you undoubtedly have never used LDAP on it, have a
-version of the Ruby programming language installed that you haven't used and
-the Apache httpd web server disabled. Why not put them to use?
+version of the Ruby programming language installed that you also haven't used
+much and the Apache httpd web server is disabled. Why not put them to use?
It is easy, run the following two commands:
@@ -11,10 +11,13 @@ This will prompt you for your password a few times, and if
you are running
macOS Catalina will even require you to reboot your machine at one point.
Once complete, you will have a virtual host defined as `whimsy.local` that
-you can access in your web browser.
+you can access in your web browser. The whole process should take about
+five minutes, possibly less if you already have things like `brew` installed.
-What you don't have is the various svn repostories checked out that you will
-need. For example, if you go to the board agenda application, after you
provide your Apache LDAP user and password, you will see a screen showing an
error:
+What you won't have yet is the various svn repostories checked out that you
+will need. For example, if you go to the board agenda application, after you
+provide your Apache LDAP user and password you will see a screen showing an
+error:
Unable to find svn checkout for
https://svn.apache.org/repos/private/foundation/board (foundation_board)
(Exception)
@@ -26,7 +29,7 @@ To correct this, do the following:
Now you will have the board agenda tool up and running, but over time you will
find that you need more svn repositories checked out. You can repeat this
process each time, or check out everything you possibly might ever need (which
-currently required 93G! - something Sebb is working on getting down) with the =
+currently required 93G! - something Sebb is working on getting down) with the
following command:
cd /srv/svn/whimsy
@@ -34,10 +37,11 @@ following command:
Don't want to instal things on your machine? If you have Docker installed, you
can use that instead, simply pass `--docker` to the `setupmymac` command above
-and you will have a Docker image created. This will take longer and require
-more disk space, runs slower, and is less convenient, but is more secure, more
+and you will have a Docker image created. This will take longer, require more
+disk space, runs slower, and is less convenient, but is more secure, more
closely matches how the production whimsy server is configured, and can easily
-be removed when done. You start the server with the following commands:
+be removed when done. Once complete, you start the server with the following
+commands:
cd /srv/whimsy
rake docker:up
@@ -45,7 +49,7 @@ be removed when done. You start the server with the
following commands:
When running on Docker, you will access the whimsy server using
`http://localhost:1999`. You can edit your source code on your Mac machine
using your favorite IDE. If you need to "shell" into the Docker container
-(perhaps to view a log file), you can do so:
+(perhaps to view a log file?), you can do so:
cd /srv/whimsy
rake docker:exec
@@ -54,10 +58,10 @@ The Docker configuration is new and hasn't been heavily
tested, so there
likely will be some problems. Join us on
[[email protected]](https://lists.apache.org/[email protected]),
or even better, provide a pull request!
-You can even switch back and forth (using the same checked out svn files) by
-rerunning `setupmymac` again with a different option. Once you have both
-configurations set up. This will change permissions on a few files, but
-everything else is the same.
+You can even switch back and forth (using the same checked out svn files and
+whimsy source code) by rerunning `setupmymac` again with a different option.
+Once you have both configurations set up running this command again will change
+permissions on a few files, but everything else is the same.
If you want to know what is going on under the covers with the setupmymac
scripts, visit either the [macOS](./MACOSX.md) or [Docker](./DOCKER.md)
