jdb/timestamper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Jonathan Bernard 2011-03-17 04:17:26 +00:00
commit 81fb56022c
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -2,7 +2,7 @@ MODS = $(wildcard src/*.erl)
BEAMS = $(MODS:src/%.erl=ebin/%.beam)
TEST_MODS = $(wildcard test/*.erl)
TEST_BEAMS = $(TEST_MODS:test/%.erl=test/%.beam)
YAWS_ROOT=/usr/lib/yaws/timestamper
TS_ROOT=/usr/lib/yaws/jdb-labs/timestamper
default: compile
@ -43,12 +43,13 @@ test/%.beam : test/%.erl
deploy: compile
@service yaws stop
@echo Removing existing artifacts.
@rm -r $(YAWS_ROOT)/*
- @rm -r $(TS_ROOT)
@echo Copying current artifacts.
@cp -r www $(YAWS_ROOT)
@cp -r ebin $(YAWS_ROOT)
@mkdir $(YAWS_ROOT)/include
@cp -r src/ts_db_records.hrl $(YAWS_ROOT)/include/.
@cp yaws.prod.conf $(YAWS_ROOT)/yaws.conf
@mkdir -p $(TS_ROOT)
@cp -r www $(TS_ROOT)
@cp -r ebin $(TS_ROOT)
@mkdir $(TS_ROOT)/include
@cp -r src/ts_db_records.hrl $(TS_ROOT)/include/.
@cp yaws.prod.conf $(TS_ROOT)/yaws.conf
@service yaws start
@echo Done.

2
yaws.dev.conf
View File

@ -3,7 +3,7 @@ ebin_dir = /home/jdbernard/projects/timestamper/web-app/ebin
runmod = timestamper_dev
<server timestamper-test>
<server timestamper.jdb-labs-local>
port = 8000
listen = 127.0.0.1
docroot = /home/jdbernard/projects/timestamper/web-app/www

8
yaws.prod.conf
View File

@ -1,11 +1,11 @@
ebin_dir = /usr/lib/yaws/timestamper/ebin
include_dir = /usr/lib/yaws/timestamper/include
ebin_dir = /usr/lib/yaws/jdb-labs/timestamper/ebin
include_dir = /usr/lib/yaws/jdb-labs/timestamper/include
runmod = timestamper
<server timestamper.jdbernard.com>
<server timestamper.jdb-labs.com>
port = 80
listen = 0.0.0.0
docroot = /usr/lib/yaws/timestamper/www
docroot = /usr/lib/yaws/jdb-labs/timestamper/www
appmods = ts_api
</server>