diff --git a/README.md b/README.md index 85594f7b..fd4d1ada 100644 --- a/README.md +++ b/README.md @@ -685,10 +685,10 @@ SOFTWARE. [example-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg [example-armv7-shield]: https://img.shields.io/badge/armv7-no-red.svg [example-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg -[addon-ftp]: https://github.com/hassio-addons/addon-ftp/tree/v1.5.1 -[addon-doc-ftp]: https://github.com/hassio-addons/addon-ftp/blob/v1.5.1/README.md +[addon-ftp]: https://github.com/hassio-addons/addon-ftp/tree/v2.0.0 +[addon-doc-ftp]: https://github.com/hassio-addons/addon-ftp/blob/v2.0.0/README.md [ftp-issue]: https://github.com/hassio-addons/addon-ftp/issues -[ftp-version-shield]: https://img.shields.io/badge/version-v1.5.1-blue.svg +[ftp-version-shield]: https://img.shields.io/badge/version-v2.0.0-blue.svg [ftp-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/ftp-armhf.svg [ftp-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg [ftp-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg diff --git a/ftp/CHANGELOG.md b/ftp/CHANGELOG.md index 56546c1b..347d3673 100644 --- a/ftp/CHANGELOG.md +++ b/ftp/CHANGELOG.md @@ -1,20 +1,21 @@ [Full Changelog][changelog] -### Changed +### Changes -- Fix typo (#3) (@antoni-k) -- Fixes spelling error in Dockerfile -- Removes BountySource links -- Removes Anchore.io links -- Updates maintenance year to 2019 -- Refactor of GitLab CI -- Upgrades gcc to 6.4.0-r9 -- Upgrades openssl to 1.0.2q-r0 -- Upgrades add-on base image to 2.3.1 -- Configure Renovate (#6) -- Replaces add-on link with GitHub link +- :arrow_up: Upgrades add-on base image to 3.0.1 +- :arrow_up: Upgrades gcc to 8.2.0-r2 +- :arrow_up: Upgrades musl-dev to 1.1.20-r4 +- :arrow_up: Upgrades openssl to 1.1.1b-r1 +- :arrow_up: Upgrades vsftpd to 3.0.3-r6 +- :hammer: Makes log_level optional +- :fire: Removes custom log format override +- :sparkles: Adds support for ARMv7 +- :books: Updates documentation for ARMv7 +- :hammer: Rewrite add-on onto Bashio +- :sparkles: Allow username to be a secret (#5) (@tjorim) +- :ambulance: Fixes regex in add-on config -[changelog]: https://github.com/hassio-addons/addon-ftp/compare/v1.5.0...v1.5.1 +[changelog]: https://github.com/hassio-addons/addon-ftp/compare/v1.5.1...v2.0.0 Questions? Join our Discord server! https://discord.me/hassioaddons Enjoying my add-ons? Consider supporting my work: https://patreon.com/frenck \ No newline at end of file diff --git a/ftp/README.md b/ftp/README.md index dafc08a6..01c56b32 100644 --- a/ftp/README.md +++ b/ftp/README.md @@ -46,12 +46,12 @@ If you are more interested in stable releases of our add-ons: [buymeacoffee]: https://www.buymeacoffee.com/frenck [discord-shield]: https://img.shields.io/discord/478094546522079232.svg [discord]: https://discord.me/hassioaddons -[docs]: https://github.com/hassio-addons/addon-ftp/blob/v1.5.1/README.md +[docs]: https://github.com/hassio-addons/addon-ftp/blob/v2.0.0/README.md [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg [forum]: https://community.home-assistant.io/t/community-hass-io-add-on-ftp/36799?u=frenck [maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg [patreon-shield]: https://www.frenck.nl/images/patreon.png [patreon]: https://www.patreon.com/frenck [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg -[release-shield]: https://img.shields.io/badge/version-v1.5.1-blue.svg -[release]: https://github.com/hassio-addons/addon-ftp/tree/v1.5.1 \ No newline at end of file +[release-shield]: https://img.shields.io/badge/version-v2.0.0-blue.svg +[release]: https://github.com/hassio-addons/addon-ftp/tree/v2.0.0 \ No newline at end of file diff --git a/ftp/config.json b/ftp/config.json index 44518af1..3a41889e 100644 --- a/ftp/config.json +++ b/ftp/config.json @@ -1,6 +1,6 @@ { "name": "FTP", - "version": "1.5.1", + "version": "2.0.0", "slug": "ftp", "description": "A secure and fast FTP server for Hass.io", "url": "https://github.com/hassio-addons/addon-ftp", @@ -9,6 +9,7 @@ "aarch64", "amd64", "armhf", + "armv7", "i386" ], "boot": "auto", @@ -28,7 +29,6 @@ "ssl:rw" ], "options": { - "log_level": "info", "port": 21, "data_port": 20, "banner": "Welcome to the Hass.io FTP service.", @@ -58,7 +58,7 @@ ] }, "schema": { - "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)", + "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?", "port": "port", "data_port": "port", "banner": "str", @@ -73,7 +73,7 @@ "max_clients": "int", "users": [ { - "username": "match(^[a-zA-Z0-9\\d](?:[a-zA-Z0-9\\d]|-(?=[a-zA-Z0-9\\d])){0,32}$)", + "username": "match(^!secret [a-zA-Z0-9_\\-]+$|^[a-zA-Z0-9\\d](?:[a-zA-Z0-9\\d]|-(?=[a-zA-Z0-9\\d])){0,32}$)", "password": "str", "allow_chmod": "bool", "allow_download": "bool", @@ -88,8 +88,5 @@ ], "i_like_to_be_pwned": "bool?" }, - "environment": { - "LOG_FORMAT": "{LEVEL}: {MESSAGE}" - }, "image": "hassioaddons/ftp-{arch}" } \ No newline at end of file