From 7ca552801b9a083b27732dc7a52b25e3b60aca20 Mon Sep 17 00:00:00 2001
From: Joshua Merrell <joshuamerrell@gmail.com>
Date: Sat, 12 Aug 2017 16:46:00 -0700
Subject: [PATCH] fix vagrant invalid file path error, update README

---
 .gitignore                               |  2 ++
 README.md                                | 14 ++++++--------
 gochan-fcgi.conf => gochan-fastcgi.nginx |  0
 gochan-http.conf => gochan-http.nginx    |  0
 vagrant/bootstrap.sh                     |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename gochan-fcgi.conf => gochan-fastcgi.nginx (100%)
 rename gochan-http.conf => gochan-http.nginx (100%)

diff --git a/.gitignore b/.gitignore
index 8dc206a4..ca167ea8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ config.cfg
 gochan
 log/
 lib/
+vagrant/.vagrant/
+vagrant/ubuntu-xenial-16.04-cloudimg-console.log
\ No newline at end of file
diff --git a/README.md b/README.md
index 330bb7a3..647631b6 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,15 @@
 # Gochan
-
 A multi-threaded imageboard server written in Go
 
 http://gochan.org
 
 
-Installation
-------------
+## Installation
 
+### Basic installation
 Coming soon!
 
-
-Documentation
--------------
-
-Coming soon!
+### For developers (using Vagrant)
+1. Install Vagrant and Virtualbox. Vagrant lets you create a virtual machine and run a custom setup/installation script to make installation easier and faster.
+2. From the command line, cd into vagrant/ and run `vagrant up`
+3. After it finishes installing the Ubuntu VM, follow the printed instructions.
\ No newline at end of file
diff --git a/gochan-fcgi.conf b/gochan-fastcgi.nginx
similarity index 100%
rename from gochan-fcgi.conf
rename to gochan-fastcgi.nginx
diff --git a/gochan-http.conf b/gochan-http.nginx
similarity index 100%
rename from gochan-http.conf
rename to gochan-http.nginx
diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh
index 998a0397..0e2625fc 100755
--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh
@@ -38,7 +38,7 @@ EOF123
 service mysql restart &
 wait
 rm -f /etc/nginx/sites-enabled/* /etc/nginx/sites-available/*
-cp -f /vagrant/gochan.nginx /etc/nginx/sites-available/gochan.nginx
+cp -f /vagrant/gochan-fastcgi.nginx /etc/nginx/sites-available/gochan.nginx
 ln -sf /etc/nginx/sites-available/gochan.nginx /etc/nginx/sites-enabled/
 
 # VirtualBox shared folders don't play nicely with sendfile.
@@ -88,4 +88,4 @@ echo
 echo "Server set up, please run \"vagrant ssh\" on your host machine, and"
 echo "\"cd ~/gochan && ./gochan\" in the guest. Then browse to http://172.27.0.3/manage"
 echo "to complete installation (TODO: add further instructions as default initial announcement"
-echo "or /manage?action=firstrun)"
\ No newline at end of file
+echo "or /manage?action=firstrun)"