fix debian packaging

rebar.config

@@ -16,7 +16,7 @@
   {jsone, "~>1.2.3"},
   fifo_utils,
   {msgpack, "0.3.5"},
-  {dqe, ".*", {git, "https://gitlab.com/Project-FiFo/DalmatinerDB/dqe.git", {branch, "master"}}},
+  {dqe, ".*", {git, "https://gitlab.com/Project-FiFo/DalmatinerDB/dqe.git", {tag, "v0.7.14"}}},
   {otters, "~>0.2.0"},
   eper,
   recon
@@ -103,7 +103,7 @@
     {mkdir, "share"},
     {copy, "rel/files/erl", "erts-\{\{erts_vsn\}\}/bin/erl"},
     {copy, "rel/files/nodetool", "erts-\{\{erts_vsn\}\}/bin/nodetool"},
-    {template, "rel/files/dalmatinerfe", "bin/dalmatinerfe"},
+    {template, "rel/files/dfe", "bin/dfe"},
 
     {template, "share/dfe.xml", "share/dfe.xml"},
 

rebar.lock

@@ -8,7 +8,7 @@
  {<<"dproto">>,{pkg,<<"dproto">>,<<"0.5.6">>},2},
  {<<"dqe">>,
   {git,"https://gitlab.com/Project-FiFo/DalmatinerDB/dqe.git",
-       {ref,"6909a80d00e78cd3510ad30e023f340df48956f1"}},
+       {ref,"ba7cfde45b28b10ba0511a7f2763512651d99bd0"}},
   0},
  {<<"dqe_fun">>,{pkg,<<"dqe_fun">>,<<"0.2.1">>},1},
  {<<"dqe_idx">>,{pkg,<<"dqe_idx">>,<<"0.4.4">>},1},
@@ -22,7 +22,7 @@
  {<<"fifo_utils">>,{pkg,<<"fifo_utils">>,<<"0.1.53">>},0},
  {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
  {<<"hdr_histogram">>,{pkg,<<"hdr_histogram">>,<<"0.3.2">>},1},
- {<<"ibrowse">>,{pkg,<<"ibrowse">>,<<"4.4.0">>},1},
+ {<<"ibrowse">>,{pkg,<<"ibrowse">>,<<"4.4.1">>},1},
  {<<"jsone">>,{pkg,<<"jsone">>,<<"1.2.6">>},0},
  {<<"jsx">>,{pkg,<<"jsx">>,<<"2.8.3">>},2},
  {<<"jsxd">>,{pkg,<<"jsxd">>,<<"0.2.4">>},3},
@@ -31,7 +31,7 @@
  {<<"lager_logstash_backend">>,
   {pkg,<<"lager_logstash_backend">>,<<"0.1.3">>},
   1},
- {<<"mmath">>,{pkg,<<"mmath">>,<<"0.2.26">>},1},
+ {<<"mmath">>,{pkg,<<"mmath">>,<<"0.2.25">>},1},
  {<<"msgpack">>,{pkg,<<"msgpack">>,<<"0.3.5">>},0},
  {<<"otters">>,{pkg,<<"otters">>,<<"0.2.10">>},0},
  {<<"pgapp">>,{pkg,<<"pgapp">>,<<"0.0.2">>},2},
@@ -41,12 +41,12 @@
        {ref,"fcfb8105014b8bef19f50dd89647c0e58dae0903"}},
   1},
  {<<"qdate_localtime">>,{pkg,<<"qdate_localtime">>,<<"1.1.0">>},2},
- {<<"quickrand">>,{pkg,<<"quickrand">>,<<"1.7.4-rc1">>},1},
+ {<<"quickrand">>,{pkg,<<"quickrand">>,<<"1.7.4">>},1},
  {<<"ranch">>,{pkg,<<"ranch">>,<<"1.2.1">>},0},
  {<<"recon">>,{pkg,<<"recon">>,<<"2.3.6">>},0},
  {<<"snappiest">>,{pkg,<<"snappiest">>,<<"1.2.0">>},3},
  {<<"sqlmig">>,{pkg,<<"sqlmig">>,<<"0.1.5">>},2},
- {<<"uuid">>,{pkg,<<"uuid_erl">>,<<"1.7.3">>},1}]}.
+ {<<"uuid">>,{pkg,<<"uuid_erl">>,<<"1.7.4">>},1}]}.
 [
 {pkg_hash,[
  {<<"cf">>, <<"7F2913FFF90ABCABD0F489896CFEB0B0674F6C8DF6C10B17A83175448029896C">>},
@@ -68,23 +68,23 @@
  {<<"fifo_utils">>, <<"1B6E95A5EDB22CC4439E904BE6F2EB48E352C536A03B1EF790F9F30EB3384728">>},
  {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
  {<<"hdr_histogram">>, <<"11F4DB284E254614A2164EEF0BFCAB70F9F053481DB428D65E0ACB4B71DB2E4F">>},
- {<<"ibrowse">>, <<"2D923325EFE0D2CB09B9C6A047B2835A5EDA69D8A47ED6FF8BC03628B764E991">>},
+ {<<"ibrowse">>, <<"2B7D0637B0F8B9B4182DE4BD0F2E826A4DA2C9B04898B6E15659BA921A8D6EC2">>},
  {<<"jsone">>, <<"3EED1BC3F34D5727A011AB84A20230F4BDD8BB2B9C07C3AD0DCF412410231A74">>},
  {<<"jsx">>, <<"A05252D381885240744D955FBE3CF810504EB2567164824E19303EA59EEF62CF">>},
  {<<"jsxd">>, <<"C14114AFCA463F2D03D3FB6CC81FD51CDA8CA86A47E5AC3ABDF0CA572A73A413">>},
  {<<"lager">>, <<"614A8C8F67BF99B69EB264EA22121AD25511C055AAEC09B086773D5108C6767F">>},
  {<<"lager_graylog">>, <<"B81F6CC71198F0CF113E74395A12F9C87E22F7B57F5E484A4802413E2A5B8F2C">>},
  {<<"lager_logstash_backend">>, <<"86E7FBE08B34DAF9341E9FC397EADFCD7C1ABA0A0EA901FA7A4C454A3C4C335C">>},
- {<<"mmath">>, <<"C666346C55DC838A3DDDCCDDED36362319849D1F1C90315D1A402F1508025F73">>},
+ {<<"mmath">>, <<"63531313D3DA9C0BF979B9C9FCCC6A168BF0FCE0B0FBC825BC582C225DF42AC4">>},
  {<<"msgpack">>, <<"1C46114241011452DEEC8145851745A0BB5B637CEE028D4D4ADB9DC3527AF06A">>},
  {<<"otters">>, <<"31A7B47D50E14B15CAE380D060F666A54A2D79688BCC29D4CCB70E2FE05B0EA8">>},
  {<<"pgapp">>, <<"3E104BB777C8455D8B26D1538B67ABE0188EE97B1DF973FD936C2204CB316196">>},
  {<<"poolboy">>, <<"6B46163901CFD0A1B43D692657ED9D7E599853B3B21B95AE5AE0A777CF9B6CA8">>},
  {<<"qdate_localtime">>, <<"5F6C3ACF10ECC5A7E2EFA3DCD2C863102B962188DBD9E086EC01D29FE029DA29">>},
- {<<"quickrand">>, <<"61A9AF693C8B4FC9F838818493BCEE127AA2EE70483BE32BAD20C760C208E8BA">>},
+ {<<"quickrand">>, <<"F91F34469D6AC153B951BB34DD9C78029882426BD61E12B85E5EE465850C08ED">>},
  {<<"ranch">>, <<"A6FB992C10F2187B46FFD17CE398DDF8A54F691B81768F9EF5F461EA7E28C762">>},
  {<<"recon">>, <<"2BCAD0CF621FB277CABBB6413159CD3AA30265C2DEE42C968697988B30108604">>},
  {<<"snappiest">>, <<"25706FEBB5ECAEA900D879A89C6D967C8D1BF700F8546BEBD0DEA514A8CCBFB7">>},
  {<<"sqlmig">>, <<"8208D222A9335C1B1171F4FD1CE4150CF28B1FDF37CA9A66715AC434ED9B9AF4">>},
- {<<"uuid">>, <<"C5DF97D1A3D626235C2415E74053C47B2138BB863C5CD802AB5CAECB8ECC019F">>}]}
+ {<<"uuid">>, <<"4EC01367FEDFBAEEB9D9BC88B2D239D42CE5B53AD284741262F86B71EB82FBFA">>}]}
 ].

rel/deb/Makefile

@@ -12,12 +12,12 @@ prepare:
 	mkdir -p stage/var/lib/dfe
 	mkdir -p stage/var/log/dfe
 	mkdir -p stage/DEBIAN
-	cp -r ../../_build/deb/rel/dalmatinerfe/bin stage/usr/lib/dfe/
-	cp -r ../../_build/deb/rel/dalmatinerfe/etc stage/data/dalmatinerfe/etc/
-	cp -r ../../_build/deb/rel/dalmatinerfe/erts-* stage/usr/lib/dfe/
-	cp -r ../../_build/deb/rel/dalmatinerfe/lib stage/usr/lib/dfe/
-	cp -r ../../_build/deb/rel/dalmatinerfe/releases stage/usr/lib/dfe/
-	cp -r ../../_build/deb/rel/dalmatinerfe/share stage/usr/lib/dfe/
+	cp -r ../../_build/deb/rel/dfe/bin stage/usr/lib/dfe/
+	cp -r ../../_build/deb/rel/dfe/etc stage/data/dalmatinerfe/etc/
+	cp -r ../../_build/deb/rel/dfe/erts-* stage/usr/lib/dfe/
+	cp -r ../../_build/deb/rel/dfe/lib stage/usr/lib/dfe/
+	cp -r ../../_build/deb/rel/dfe/releases stage/usr/lib/dfe/
+	cp -r ../../_build/deb/rel/dfe/share stage/usr/lib/dfe/
 	cp -r systemd/dalmatinerfe.service stage/etc/systemd/system/dalmatinerfe.service
 	cp control stage/DEBIAN/	
 	cp preinst stage/DEBIAN/

rel/deb/systemd/dalmatinerfe.service

@@ -5,7 +5,7 @@ After=network.target
 [Service]
 User=dalmatinerfe
 Group=dalmatinerfe
-ExecStart=/usr/lib/dfe/bin/dalmatinerfe console -noinput +Bd
+ExecStart=/usr/lib/dfe/bin/dfe console -noinput +Bd
 
 [Install]
 WantedBy=multi-user.target

rel/deb/upstart/dfe

@@ -2,4 +2,4 @@ description "Dalmatiner Frontend"
 start on filesystem
 stop on runlevel [06]
 respawn
-exec /usr/lib/dfe/bin/dalmatinerfe console -noinput +Bd
+exec /usr/lib/dfe/bin/dfe console -noinput +Bd

rel/vars.config

@@ -2,6 +2,7 @@
 %% rebar.config
 %%
 {build_dir, "{{output_dir}}/../.."}.
+{cuttlefish_conf,       "dfe.conf"}.
 
 %%
 %% etc/app.config