From 7ea8fcb5ec64b3ccf8990de83285b2645900bac8 Mon Sep 17 00:00:00 2001
From: Andrew Miner <andrewminer@mac.com>
Date: Sat, 17 Aug 2013 17:04:36 -0700
Subject: [PATCH] Change dir structure for deployment

---
 crafting.js => html/crafting.js        |  2 +-
 vanilla.json => html/data/vanilla.json |  0
 index.html => html/index.html          |  0
 httpd.conf                             | 16 ++++++++++++++++
 scripts/connect                        |  3 +++
 scripts/deploy                         |  6 ++++++
 6 files changed, 26 insertions(+), 1 deletion(-)
 rename crafting.js => html/crafting.js (99%)
 rename vanilla.json => html/data/vanilla.json (100%)
 rename index.html => html/index.html (100%)
 create mode 100644 httpd.conf
 create mode 100755 scripts/connect
 create mode 100755 scripts/deploy

diff --git a/crafting.js b/html/crafting.js
similarity index 99%
rename from crafting.js
rename to html/crafting.js
index 9eed17375..56cbe057d 100644
--- a/crafting.js
+++ b/html/crafting.js
@@ -9,7 +9,7 @@ function onPageLoad() {
     $("#recipe_load_button").click(onRecipeLoadButtonClicked);
     $("#crafting_selector").change(onCraftingSelectorChanged);
 
-    loadRecipes("vanilla.json");
+    loadRecipes("data/vanilla.json");
 }
 
 function onCraftingSelectorChanged() {
diff --git a/vanilla.json b/html/data/vanilla.json
similarity index 100%
rename from vanilla.json
rename to html/data/vanilla.json
diff --git a/index.html b/html/index.html
similarity index 100%
rename from index.html
rename to html/index.html
diff --git a/httpd.conf b/httpd.conf
new file mode 100644
index 000000000..aee56f5cc
--- /dev/null
+++ b/httpd.conf
@@ -0,0 +1,16 @@
+<VirtualHost *:80>
+    ServerName www.crafting-guide.com
+    ErrorLog logs/crafting-guide.com-error_log
+    CustomLog logs/crafting-guide.com-access_log common
+
+    DocumentRoot /home/crafting-guide/repo/html
+    <Directory "/home/crafting-guide/repo/html">
+        AllowOverride None
+    </Directory>
+
+    <Directory "/home/crafting-guide/repo/html/private">
+        Options Indexes
+        Order allow,deny
+        Allow from all
+    </Directory>
+</VirtualHost>
diff --git a/scripts/connect b/scripts/connect
new file mode 100755
index 000000000..32e80c17c
--- /dev/null
+++ b/scripts/connect
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+ssh mountainbroadband@www.mountainbroadband.org
diff --git a/scripts/deploy b/scripts/deploy
new file mode 100755
index 000000000..4941db108
--- /dev/null
+++ b/scripts/deploy
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+ssh mountainbroadband@www.mountainbroadband.org << EOF
+    cd repo
+    git pull
+EOF