From fa3142ca3167dc78e26a99f0d56f19400e48e08c Mon Sep 17 00:00:00 2001
From: Christine Dodrill <xena@yolo-swag.com>
Date: Fri, 13 Feb 2015 12:22:33 -0800
Subject: [PATCH] Move init stuff to init/

Makefile: expose olegdb for testing
---
 Dockerfile                           | 4 ++--
 Makefile                             | 2 +-
 {oleg => init/oleg}/olegdb.conf      | 0
 {oleg => init/oleg}/runit/olegdb/run | 0
 {oleg => init/oleg}/seed.sh          | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename {oleg => init/oleg}/olegdb.conf (100%)
 rename {oleg => init/oleg}/runit/olegdb/run (100%)
 rename {oleg => init/oleg}/seed.sh (100%)

diff --git a/Dockerfile b/Dockerfile
index c9bea99..03b5807 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM xena/lapis:1.7.7.2
 
-ADD oleg /seed/oleg
+ADD init/oleg /seed/oleg
 RUN mv /seed/oleg/olegdb.conf /oleg/db.conf
-ADD oleg/runit/ /etc/service
+ADD init/oleg/runit/ /etc/service
diff --git a/Makefile b/Makefile
index bb42913..c3a84c6 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ build:
 test: build
 	@echo "http://127.0.0.1:5000"
 	@echo "press ^C to kill the test server"
-	docker run -p 5000:5000 --name site-$(GIT_REV) --rm -it -e GIT_REV=$(GIT_REV) -e GITHUB_TOKEN=$(GITHUB_TOKEN) xena/site /bin/bash
+	docker run -p 5001:38080 -p 5000:5000 --name site-$(GIT_REV) --rm -it -e GIT_REV=$(GIT_REV) -e GITHUB_TOKEN=$(GITHUB_TOKEN) xena/site /bin/bash
 
 deploy:
 	git push
diff --git a/oleg/olegdb.conf b/init/oleg/olegdb.conf
similarity index 100%
rename from oleg/olegdb.conf
rename to init/oleg/olegdb.conf
diff --git a/oleg/runit/olegdb/run b/init/oleg/runit/olegdb/run
similarity index 100%
rename from oleg/runit/olegdb/run
rename to init/oleg/runit/olegdb/run
diff --git a/oleg/seed.sh b/init/oleg/seed.sh
similarity index 100%
rename from oleg/seed.sh
rename to init/oleg/seed.sh