diff options
| author | nachoparker <nacho@ownyourbits.com> | 2018-06-24 16:08:53 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2018-06-24 16:10:11 +0300 |
| commit | fe12ff9e24969fff690cb94d9755fe22ead24767 (patch) | |
| tree | 48ec6795c0e0cf1a5c5c2df61638bd20bf1a8503 | |
| parent | bbb25fa49ca06708b14d569b437cfdce6854e838 (diff) | |
nc-limits: fix unitsv0.57.13
| -rw-r--r-- | changelog.md | 6 | ||||
| -rw-r--r-- | etc/ncp-config.d/nc-limits.sh | 2 | ||||
| -rw-r--r-- | ncp-web/ncp-web.cfg | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/changelog.md b/changelog.md index a61c22b2..5f1f9f16 100644 --- a/changelog.md +++ b/changelog.md @@ -1,11 +1,13 @@ -[v0.57.12](https://github.com/nextcloud/nextcloudpi/commit/b0203ab) (2018-06-21) nc-limits: autolimits enhancements +[v0.57.13](https://github.com/nextcloud/nextcloudpi/commit/2c9c790) (2018-06-24) nc-limits: fix units + +[v0.57.12](https://github.com/nextcloud/nextcloudpi/commit/79da40a) (2018-06-21) nc-limits: autolimits enhancements [v0.57.11](https://github.com/nextcloud/nextcloudpi/commit/038b260) (2018-06-20) letsencrypt: notify of renewals [v0.57.10](https://github.com/nextcloud/nextcloudpi/commit/88843ab) (2018-06-20) ncp-web: fix JS docker detection -[v0.57.9](https://github.com/nextcloud/nextcloudpi/commit/ad64a4b) (2018-06-21) nc-format-USB: fix when ZRAM active +[v0.57.9 ](https://github.com/nextcloud/nextcloudpi/commit/ad64a4b) (2018-06-21) nc-format-USB: fix when ZRAM active [v0.57.8 ](https://github.com/nextcloud/nextcloudpi/commit/e63523c) (2018-06-19) docker: adapt wizard diff --git a/etc/ncp-config.d/nc-limits.sh b/etc/ncp-config.d/nc-limits.sh index a9bfce03..706d0131 100644 --- a/etc/ncp-config.d/nc-limits.sh +++ b/etc/ncp-config.d/nc-limits.sh @@ -19,7 +19,7 @@ INFO="Examples: 200M or 2G. Write 0 for autoconfig" configure() { # Set auto memory limit to 75% of the total memory - local TOTAL_MEM="$( free | sed -n 2p | awk '{ print $2 }' )" + local TOTAL_MEM="$( free -b | sed -n 2p | awk '{ print $2 }' )" AUTOMEM=$(( TOTAL_MEM * 75 / 100 )) # MAX FILESIZE diff --git a/ncp-web/ncp-web.cfg b/ncp-web/ncp-web.cfg index 605813ce..9060ea23 100644 --- a/ncp-web/ncp-web.cfg +++ b/ncp-web/ncp-web.cfg @@ -1 +1 @@ -LANGUAGE_=[auto,en,de,_es_,zn]
\ No newline at end of file +LANGUAGE_=[_auto_,en,de,es,zn] |