From 68345da63ffd46aac3878c346bfa1de3e3c06311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Mat=C4=9Bjek?= <martin.matejek@nic.cz>
Date: Thu, 1 Apr 2021 16:53:54 +0200
Subject: [PATCH] version 0.6.4

---
 CHANGELOG.md                                | 54 +++++++++++++++++++
 CHANGELOG.rst                               | 60 ---------------------
 foris_controller_openvpn_module/__init__.py |  4 +-
 3 files changed, 56 insertions(+), 62 deletions(-)
 create mode 100644 CHANGELOG.md
 delete mode 100644 CHANGELOG.rst

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..a29db84
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,54 @@
+# Changelog
+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/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.6.4] - 2021-04-01
+### Changed
+- speed up generating of dhparam file
+- set topology "subnet" instead of "net30" (default, but for legacy clients only)
+- cleanup in tests fixtures
+- migrate changelog to Keep a Changelog style
+
+## [0.6.3] - 2020-11-11
+- return certificate name within get_client_config api call
+- generate dhparam with turris-cagen instead of using separate dhparam
+- python2 code cleanup
+
+## [0.6.2] - 2019-10-10
+- fix router ip address autodetection
+- tests: refactoring
+
+## [0.6.1] - 2019-08-12
+- use ipaddress module instead of foris_controller_utils.IPv4 and remove IPv4
+
+## [0.6 (2] -08-02-11
+- compress logic update
+- setup.py: making dependencies paho-mqtt and ubus optional
+- python2 deprecation
+- ca ready fix
+
+## [0.5.1] - 2018-11-30
+- setup.py: cleanup + PEP508 updated
+
+## [0.5 (2] -08-08-13
+- restarting network in a more propper way
+
+## [0.4 (2] -08-08-13
+- python3 compatibility
+- reflect api changes
+- test updates
+- restart entire network to ensure that new settings are used
+- more robust ipv4 wan detection in client configs
+- comp-lzo -> compress lzo option updated
+
+## [0.3 (2] -08-05-24
+- listening on IPv6 address
+- protocol support extended
+
+## [0.2 (2] -08-04-26
+- update_settings: initial state fix
+
+## [0.1 (2] -08-04-19
+- initial version
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
deleted file mode 100644
index 8e7d4de..0000000
--- a/CHANGELOG.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-0.6.3 (2020-11-11)
-------------------
-
-* return certificate name within get_client_config api call
-* generate dhparam with turris-cagen instead of using separate dhparam
-* python2 code cleanup
-
-0.6.2 (2019-10-10)
-------------------
-
-* fix router ip address autodetection
-* tests: refactoring
-
-0.6.1 (2019-08-12)
-------------------
-* use ipaddress module instead of foris_controller_utils.IPv4 and remove IPv4
-
-0.6 (2018-02-11)
-----------------
-
-* compress logic update
-* setup.py: making dependencies paho-mqtt and ubus optional
-* python2 deprecation
-* ca ready fix
-
-0.5.1 (2018-11-30)
-------------------
-
-* setup.py: cleanup + PEP508 updated
-
-0.5 (2018-08-13)
-----------------
-
-* restarting network in a more propper way
-
-0.4 (2018-08-13)
-----------------
-
-* python3 compatibility
-* reflect api changes
-* test updates
-* restart entire network to ensure that new settings are used
-* more robust ipv4 wan detection in client configs
-* comp-lzo -> compress lzo option updated
-
-0.3 (2018-05-24)
-----------------
-
-* listening on IPv6 address
-* protocol support extended
-
-0.2 (2018-04-26)
-----------------
-
-* update_settings: initial state fix
-
-0.1 (2018-04-19)
-----------------
-
-* initial version
diff --git a/foris_controller_openvpn_module/__init__.py b/foris_controller_openvpn_module/__init__.py
index a35c3a2..76558b5 100644
--- a/foris_controller_openvpn_module/__init__.py
+++ b/foris_controller_openvpn_module/__init__.py
@@ -1,6 +1,6 @@
 #
 # foris-controller-openvpn-module
-# Copyright (C) 2019-2020 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
+# Copyright (C) 2019-2021 CZ.NIC, z.s.p.o. (http://www.nic.cz/)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,4 +17,4 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 #
 
-__version__ = "0.6.3"
+__version__ = "0.6.4"
-- 
GitLab