Commit 08a82623 authored by Heinz N. Gies's avatar Heinz N. Gies

Merge branch 'test' into dev

parents be26195c 292de954
......@@ -8,7 +8,7 @@
{<<"dproto">>,{pkg,<<"dproto">>,<<"0.5.2">>},1},
{<<"dqe">>,
{git,"https://github.com/dalmatinerdb/dqe.git",
{ref,"85dcf9f1ebd344794ab64765bd660737f82f7ea1"}},
{ref,"6d8f70fa79c6ef438cfa73fc630b86281f612053"}},
0},
{<<"dqe_fun">>,{pkg,<<"dqe_fun">>,<<"0.2.1">>},1},
{<<"dqe_idx">>,{pkg,<<"dqe_idx">>,<<"0.4.3">>},1},
......@@ -19,9 +19,9 @@
{<<"epgsql">>,{pkg,<<"epgsql">>,<<"3.3.0">>},3},
{<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"1.0.0">>},0},
{<<"fifo_lager">>,{pkg,<<"fifo_lager">>,<<"0.1.6">>},0},
{<<"fifo_utils">>,{pkg,<<"fifo_utils">>,<<"0.1.44">>},0},
{<<"fifo_utils">>,{pkg,<<"fifo_utils">>,<<"0.1.48">>},0},
{<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
{<<"hdr_histogram">>,{pkg,<<"hdr_histogram">>,<<"0.2.0">>},1},
{<<"hdr_histogram">>,{pkg,<<"hdr_histogram">>,<<"0.3.2">>},1},
{<<"ibrowse">>,{pkg,<<"ibrowse">>,<<"4.4.0">>},1},
{<<"jsone">>,{pkg,<<"jsone">>,<<"1.2.6">>},0},
{<<"jsx">>,{pkg,<<"jsx">>,<<"2.8.2">>},2},
......@@ -65,9 +65,9 @@
{<<"epgsql">>, <<"974A578340E52012CBAB820CE756E7ED1DF1BAF0110C59A6753D8337A2CF9454">>},
{<<"erlware_commons">>, <<"087467DE5833C0BB5B3CCDD387F9E9C1FB816A75B7A709629BF24B5ED3246C51">>},
{<<"fifo_lager">>, <<"5D350A2C85F27F776B28E022A731B1B2F4A8C0D1703416C2553C4046AA09E837">>},
{<<"fifo_utils">>, <<"5BAB235DF3B80F7EBA7C64D0C5077C8FE35D40342E822065A54AA9925181D2A6">>},
{<<"fifo_utils">>, <<"140BC3EE5D8687DF8CD5C1C16F1CB739EE34826F546B874CF874BF671F498A00">>},
{<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
{<<"hdr_histogram">>, <<"95A7EC3C8FA354E4CFBFC8F4168EE8F07BD3965CA22B9C45B2A2C9D13B03DCEC">>},
{<<"hdr_histogram">>, <<"11F4DB284E254614A2164EEF0BFCAB70F9F053481DB428D65E0ACB4B71DB2E4F">>},
{<<"ibrowse">>, <<"2D923325EFE0D2CB09B9C6A047B2835A5EDA69D8A47ED6FF8BC03628B764E991">>},
{<<"jsone">>, <<"3EED1BC3F34D5727A011AB84A20230F4BDD8BB2B9C07C3AD0DCF412410231A74">>},
{<<"jsx">>, <<"7ACC7D785B5ABE8A6E9ADBDE926A24E481F29956DD8B4DF49E3E4E7BCC92A018">>},
......
......@@ -26,7 +26,7 @@ dalmatinerfe_start()
{
if checkyesno ${rcvar}; then
echo "* starting dalmatiner db... "
/usr/local/bin/sudo -u dalmatinerfe /usr/dpx/bin/dpx start
/usr/local/bin/sudo -u dalmatinerfe /usr/local/lib/dfe/bin/dfe start
fi
}
......@@ -34,7 +34,7 @@ dalmatinerfe_stop()
{
if checkyesno ${rcvar}; then
echo "* stopping dalmatiner db... "
/usr/local/bin/sudo -u dalmatinerfe /usr/dpx/bin/dpx stop
/usr/local/bin/sudo -u dalmatinerfe /usr/local/lib/dfe/bin/dfe stop
fi
}
......
%%
%% etc/vm.args
%%
{run_user, "dalmatinerdb"}.
\ No newline at end of file
{run_user, "dalmatinerfe"}.
......@@ -21,7 +21,7 @@ chown -R $USER:$GROUP /tmp/$USER/
echo Trying to guess configuration ...
IP=$(ifconfig $(netstat -r | grep default | awk '{ print $4 }') | grep 'inet' | awk -F ' ' '{ print $2 }')
DISTCONFFILE=/usr/dfe/etc/dfe.conf
DISTCONFFILE=/usr/local/lib/dfe/etc/dfe.conf
CONFFILE=/data/dalmatinerfe/etc/dfe.conf
if [ ! -f "${CONFFILE}" ]
......
INSTALL_DIR=usr
INSTALL_DIR=usr/local/lib
DEPS="coreutils" "sudo"
REBARPROFILE ?= default
......@@ -12,5 +12,5 @@ prepare:
mkdir -p $(STAGE_DIR)/$(INSTALL_DIR)
cp -r ../../_build/${REBARPROFILE}/rel/$(COMPONENT_INTERNAL) $(STAGE_DIR)/$(INSTALL_DIR)
rm -rf $(STAGE_DIR)/$(INSTALL_DIR)/lib/*/c_src
mkdir -p $(STAGE_DIR)/etc/rc.d
cp ../freebsd/dalmatinerdb $(STAGE_DIR)/etc/rc.d/
mkdir -p $(STAGE_DIR)/usr/local/etc/rc.d
cp ../freebsd/dalmatinerfe $(STAGE_DIR)/usr/local/etc/rc.d/
├─ cowboy─1.0.4
│ └─ cowlib─1.0.2
├─ dalmatiner_frontend─0.3.3
├─ dqe─0.7.10
├─ dqe─0.7.13
│ ├─ ddb_connection─0.4.3
│ │ ├─ ddb_client─0.5.7
│ │ └─ poolboy─1.5.1
......@@ -16,7 +16,7 @@
│ │ ├─ pgapp─0.0.2
│ │ │ └─ epgsql─3.3.0
│ │ └─ sqlmig─0.1.5
│ ├─ hdr_histogram─0.2.0
│ ├─ hdr_histogram─0.3.2
│ ├─ mmath─0.2.19
│ └─ qdate─0.4.4
│ └─ qdate_localtime─1.1.0
......@@ -27,7 +27,7 @@
│ ├─ lager_graylog─0.1.3
│ └─ lager_logstash_backend─0.1.3
│ └─ jsx─2.8.2
├─ fifo_utils─0.1.44
├─ fifo_utils─0.1.48
│ ├─ quickrand─1.7.1
│ └─ uuid─1.7.1
├─ jsone─1.2.6
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment