diff --git a/Makefile b/Makefile index 844e7070c..9f0e5d520 100644 --- a/Makefile +++ b/Makefile @@ -242,6 +242,7 @@ PKG_ID := "$(REPO_TAG)-OTP$(OTP_VER)" PKG_VERSION = $(shell echo $(PKG_ID) | sed -e 's/^$(REPO)-//') package: + compile mkdir -p rel/pkg/out/$(PKG_ID) git archive --format=tar HEAD | gzip >rel/pkg/out/$(PKG_ID).tar.gz $(MAKE) -f rel/pkg/Makefile diff --git a/priv/riak.schema b/priv/riak.schema index f2cdc048a..605090e72 100644 --- a/priv/riak.schema +++ b/priv/riak.schema @@ -118,8 +118,9 @@ ]}. %% VM emulator ignore break signal (prevent ^C / ^Gq) -{mapping, "erlang.vm.ignore_break_signal", "vm_args.+Bi", [ - {default, "true"}, +{mapping, "erlang.vm.ignore_break_signal", "vm_args.+B", [ + {default, "i"}, + {datatype, {enum, [c, d, i]}}, merge ]}. diff --git a/rel/pkg/deb/Makefile b/rel/pkg/deb/Makefile index d6bba3f57..f0d16def4 100644 --- a/rel/pkg/deb/Makefile +++ b/rel/pkg/deb/Makefile @@ -16,6 +16,7 @@ default: dch --create --package riak -v "$(PKG_VERSION)" \ "Build from $(PKG_ID)";\ debuild --prepend-path=$(ERLANG_BIN) \ + --no-lintian \ -e REVISION=$(PKG_VERSION) \ -e RELEASE=$(PKG_BUILD) \ -i -uc -us -b diff --git a/rel/pkg/deb/debian/riak.riak.service b/rel/pkg/deb/debian/riak.riak.service index 3ca055367..42f3d092f 100644 --- a/rel/pkg/deb/debian/riak.riak.service +++ b/rel/pkg/deb/debian/riak.riak.service @@ -9,6 +9,7 @@ Type=simple PIDFile=/run/riak/riak.pid EnvironmentFile=-/etc/default/riak RuntimeDirectory=riak +LimitNOFILE=524288 [Install] WantedBy=multi-user.target diff --git a/rel/vars/dev_vars.config.src b/rel/vars/dev_vars.config.src index 154916307..1446d56bc 100644 --- a/rel/vars/dev_vars.config.src +++ b/rel/vars/dev_vars.config.src @@ -31,7 +31,7 @@ {sasl_log_dir, "{{platform_log_dir}}/sasl"}. {repl_data_root, "{{platform_data_dir}}/riak_repl/"}. -{logger_level, debug}. +{logger_level, info}. %% %% etc/vm.args