diff options
| author | Badlop <badlop@process-one.net> | 2020-09-22 13:50:11 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2020-09-22 13:58:56 +0200 |
| commit | d9cb6d1af719dd53c670aa4cfc08d927c5e1954f (patch) | |
| tree | ac683ba0d5bad55011ec73aa6fc89d716cec1a84 | |
| parent | Make roster subscriptions work better with invalid roster state in db (diff) | |
| -rw-r--r-- | config/ejabberd.exs | 2 | ||||
| -rwxr-xr-x | ejabberdctl.template | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/config/ejabberd.exs b/config/ejabberd.exs index f5f21cd5b..462822183 100644 --- a/config/ejabberd.exs +++ b/config/ejabberd.exs @@ -4,9 +4,7 @@ defmodule Ejabberd.ConfigFile do def start do [loglevel: 4, log_rotate_size: 10485760, - log_rotate_date: "", log_rotate_count: 1, - log_rate_limit: 100, auth_method: :internal, max_fsm_queue: 1000, language: "en", diff --git a/ejabberdctl.template b/ejabberdctl.template index 68eaefa7b..256a40c7a 100755 --- a/ejabberdctl.template +++ b/ejabberdctl.template @@ -87,10 +87,8 @@ ERL_INETRC="$ETC_DIR"/inetrc # define ejabberd parameters EJABBERD_OPTS="$EJABBERD_OPTS\ -$(sed '/^log_rate_limit/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\ $(sed '/^log_rotate_size/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\ -$(sed '/^log_rotate_count/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\ -$(sed '/^log_rotate_date/!d;s/:[ \t]*\(.[^ ]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")" +$(sed '/^log_rotate_count/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")" [ -n "$EJABBERD_OPTS" ] && EJABBERD_OPTS="-ejabberd $EJABBERD_OPTS" EJABBERD_OPTS="-mnesia dir \"$SPOOL_DIR\" $MNESIA_OPTIONS $EJABBERD_OPTS -s ejabberd" |