Merge remote-tracking branch 'server/master'

wiki/amazon-ec2.md

@@ -50,7 +50,7 @@ MONGODB_NAME=myspecificevent
 
 #### Setting up a new image (AMI) from scratch (more or less)
 
-See [here](wiki/creating-ec2-image-from-scratch)
+See [here](creating-ec2-image-from-scratch)
 
 #### Receiving wind from Expedition
 

wiki/creating-ec2-image-from-scratch.md

@@ -17,6 +17,8 @@ I then did a `yum update` and added the following packages:
  - telnet
  - apachetop
  - goaccess
+ - postfix (for sending e-mail, e.g., to invite competitors and buoy pingers)
+ - tigervnc-server
 
 Then I created a mount point /home/sailing and copied the following lines from the /etc/fstab file from an existing SL instance:
 
@@ -95,4 +97,11 @@ To ensure that chronyd is started during the boot sequence, issued the command
 chkconfig chrony on
 ```
 
-which creates the necessary entries in the rc*.d directories.
+which creates the necessary entries in the rc*.d directories.
+
+Adjust the /etc/sysconfig/vncservers settings to something like:
+
+```
+VNCSERVERS="2:sailing"
+VNCSERVERARGS[2]="-geometry 1600x900"
+```