From 268024f592f79a54e7cb988dd64e3552d94b169c Mon Sep 17 00:00:00 2001
From: Dominik Dancs <dominik@dancs.sk>
Date: Fri, 19 Nov 2021 09:18:21 +0100
Subject: [PATCH] changelog update

---
 CHANGELOG.md | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 docker/.env  |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b987c2c59..caa4d4237 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,55 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [v21.11.1] - 2021-11-19
+### Added
+* Added collector management to manage.py - https://github.com/SK-CERT/Taranis-NG/issues/18
+
+### Changed
+* Docker readme: Fix URLs/Ports with switch to HTTPS by @sebix in https://github.com/SK-CERT/Taranis-NG/pull/21
+* Tidied up word lists
+* Re-worked proxy handling for the RSS collector
+* Fixed issues with collector node and OSINT source status models and schemas - https://github.com/SK-CERT/Taranis-NG/issues/23
+
+## [v21.10.6] - 2021-11-10
+### Added
+- added sample word block list for tag cloud
+
+### Changed
+- more verbose logging in the RSS collector
+- usability fixes in collectors
+- fixed asset group updates
+- improved default templates for products
+
+## [v21.10.5] - 2021-11-09
+### Added
+- authors of _Product templates_ may now use the new `Configuration -> Product types` help screen, which lists all the fields defined in a chosen _Report item type_. This simplifies the development of new product templates.
+
+### Changed
+- GUI and RSS collector fixes
+
+## [v21.10.4] - 2021-11-08
+### Added
+- keycloak container (not enabled yet)
+
+### Changed
+- gui: fix news item group operations
+- gui: bundle fonts
+- gui: upgrade for security (breaks minor stuff, will be fixed in a later release)
+- web collector: minor improvements
+
+## [v21.10.3] - 2021-11-08
+### Changed
+- minor fixes and improvements across the entire project
+- security patches for third party libraries
+- docker:
+   - deployment now includes Traefik as a reverse proxy for more convenient deployment (supports self generated, pre-uploaded, and letsencrypt certificates)
+   - collectors container minimised
+- complete rewrite of web collector: more robust, better support for various selectors, upgrade to selenium 4.0.0
+
+### New Contributors
+- @sebix made their first contribution in https://github.com/SK-CERT/Taranis-NG/pull/5
+
 ## [v21.10.2] - 2021-09-25
 ### Added
 - sample templates for products (PDF, HTML, TXT, MISP)
@@ -19,5 +68,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Merged multiple Taranis NG repositories into one for easier understanding and management of the project
 
 
+[v21.11.1]: https://github.com/SK-CERT/Taranis-NG/releases/tag/v21.11.1
+[v21.10.6]: https://github.com/SK-CERT/Taranis-NG/releases/tag/v21.10.6
+[v21.10.5]: https://github.com/SK-CERT/Taranis-NG/releases/tag/v21.10.5
+[v21.10.4]: https://github.com/SK-CERT/Taranis-NG/releases/tag/v21.10.4
+[v21.10.3]: https://github.com/SK-CERT/Taranis-NG/releases/tag/v21.10.3
 [v21.10.2]: https://github.com/SK-CERT/Taranis-NG/releases/tag/v21.10.2
 [v21.10.1]: https://github.com/SK-CERT/Taranis-NG/releases/tag/v21.10.1
diff --git a/docker/.env b/docker/.env
index eb18e7934..9b3131888 100644
--- a/docker/.env
+++ b/docker/.env
@@ -20,7 +20,7 @@ TRAEFIK_MANAGEMENT_PORT=127.0.0.1:8081
 # Versions
 REDIS_TAG=6-alpine
 POSTGRES_TAG=13-alpine
-TARANIS_NG_TAG=v21.10.6
+TARANIS_NG_TAG=v21.11.1
 
 # Limits
 DB_SHARED_BUFFERS=64MB