From 6ccda80a8e7570769a94915c3c4b9c22da595fb7 Mon Sep 17 00:00:00 2001 From: Jeremy Davis Date: Thu, 16 Jul 2026 14:14:55 +1000 Subject: [PATCH 1/3] Update 19.0 core changelog --- changes/turnkey.changelog | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/changes/turnkey.changelog b/changes/turnkey.changelog index 6e48d7e8..20fcef6f 100644 --- a/changes/turnkey.changelog +++ b/changes/turnkey.changelog @@ -19,18 +19,18 @@ turnkey-core-19.0 (1) turnkey; urgency=low risk of user accidentally locking themself out. - Removed redundant v18.x custom patches. - * Leverage 'iptables-persistent' package to manage firewall start/stop. - * Include 'zstd' by default to support smaller initramfs that unpacks faster. * Replace 'ifupdown' with 'ifupdown-ng' (and 'ifupdown-ng-compat'). * Replace 'udhcpc' (IPv4 only) with 'dhcpcd-base' (dual stack ipv4/6). Also - include custom TurnKey config ('tkl-dhcpcd-ifupdown-glue') to ensure DHCP - config is in sync with interfaces file. + include custom TurnKey config (if-pre-up & if-post-down scripts provided by + 'tkl-dhcpcd-ifupdown-glue') to ensure DHCP config is in sync with + /etc/network/interfaces file. - * General code cleanup including linting, formating and style updates. Still - WIP but solid start. + * General code cleanup of TurnKey code; build code, build tools and TurnKey + custom tools & libraries. Updates include linting, formating and style + updates. Still WIP but solid start. * Configuration console (confconsole): @@ -42,7 +42,10 @@ turnkey-core-19.0 (1) turnkey; urgency=low - Features: - "Proper" support for IPv6: - - Show IPv6 info on "usage" page. Special thanks to Marcos: + - Make ifutil.py module code "IPv6 aware", including reliable + management of /etc/network/interfaces with "inet6" stanza/s. + - Show IPv6 info on "usage" page - only shown if IPv6 configured. + Special thanks to Marcos: https://github.com/marcos-mendez - https://popsolutions.co/ - Misc clean up and improvements in code and packaging. See Confconsole @@ -95,7 +98,14 @@ turnkey-core-19.0 (1) turnkey; urgency=low with the intention of following upstream releases as closely as possible (provided via TurnKey apt repo). - - Ensure that Webmin listens via IPv6 by default. + - Updated default Webmin config: + - Listen on IPv6 by default. + - Preconfigured IPv6 firewall matching IPv4 rules (but not enabled - as + per historical IPv4 default). + - Auto redirect http => https. + - Default 30 min user logout (can be overridden via login page "remember + me" checkbox or webmin "authentication" config). + - Updated logging paths and fixed log file rotation. * Backup (tklbam): @@ -116,7 +126,7 @@ turnkey-core-19.0 (1) turnkey; urgency=low * Misc code cleanup and improvements. - -- Jeremy Davis Thu, 18 Jun 2026 14:53:42 +1000 + -- Jeremy Davis Thu, 16 Jul 2026 09:05:04 +1000 turnkey-core-18.1 (1) turnkey; urgency=low From 4bfe992bc1b4a9fdb6fdbb0440a4beacb4dba293 Mon Sep 17 00:00:00 2001 From: Jeremy Davis Date: Thu, 16 Jul 2026 15:30:31 +1000 Subject: [PATCH 2/3] Remove empty changelogs --- changes/lamp.changelog | 3 --- changes/lapp.changelog | 3 --- changes/php-fpm.changelog | 3 --- 3 files changed, 9 deletions(-) delete mode 100644 changes/lamp.changelog delete mode 100644 changes/lapp.changelog delete mode 100644 changes/php-fpm.changelog diff --git a/changes/lamp.changelog b/changes/lamp.changelog deleted file mode 100644 index 300fc59f..00000000 --- a/changes/lamp.changelog +++ /dev/null @@ -1,3 +0,0 @@ -turnkey-lamp-18.0 (1) turnkey; urgency=low - - -- Stefan Davis Tue, 01 Aug 2023 02:12:50 +0000 diff --git a/changes/lapp.changelog b/changes/lapp.changelog deleted file mode 100644 index aa7d31cb..00000000 --- a/changes/lapp.changelog +++ /dev/null @@ -1,3 +0,0 @@ -turnkey-lapp-18.0 (1) turnkey; urgency=low - - -- Stefan Davis Tue, 01 Aug 2023 02:12:50 +0000 diff --git a/changes/php-fpm.changelog b/changes/php-fpm.changelog deleted file mode 100644 index 1f199b0e..00000000 --- a/changes/php-fpm.changelog +++ /dev/null @@ -1,3 +0,0 @@ -turnkey-php-fpm-18.0 (2) turnkey; urgency=low - - -- Jeremy Davis Thu, 21 Sep 2023 02:17:34 +0000 From 20005c05de7af5eb8833ed2727630e151569f33e Mon Sep 17 00:00:00 2001 From: Jeremy Davis Date: Thu, 16 Jul 2026 17:19:15 +1000 Subject: [PATCH 3/3] Update changes readme --- changes/README.md | 105 +++++++++++++++++++++++++++++++++++++++++++++ changes/README.rst | 77 --------------------------------- 2 files changed, 105 insertions(+), 77 deletions(-) create mode 100644 changes/README.md delete mode 100644 changes/README.rst diff --git a/changes/README.md b/changes/README.md new file mode 100644 index 00000000..1d72e2bc --- /dev/null +++ b/changes/README.md @@ -0,0 +1,105 @@ +Common Changelog Snippets +========================= + +These changelog snippets are to assist to automagically create TurnKey Linux +appliance changelog entries which include all relevant changes- including +common changes. + +This ensures that each appliance changelog is complete and standalone, but +without need to manually copy/paste shared changelog entries. + +Filename & Format Specification +------------------------------- + +Changelog snippet files should be named:: + + COMMON/changes/COMMON_MAKFILE.changelog + +Where: + FAB_PATH path to 'fab' directory; defaults to '/turnkey/fab/' + COMMON '$FAB_PATH/common/' + COMMON_MAKFILE Name of common makefile in 'COMMON/mk/turnkey/'; e.g. + 'apache' refers to 'COMMON/mk/turnkey/apache.mk' + COMMON_CHANGELOG Matching changelog file; e.g.: + 'COMMON/changes/apache.changelog' + TKL_VERSION Numerical TurnKey Linux version; e.g. '19.0' + +The contents must be formatted as per valid Debian changelog requirements. The +firstline of each new release entry should be in the following format:: + +``` +turnkey-COMMON_MAKFILE_NAME-TKL_VERSION (1) turnkey; urgency=low +``` + +E.g. to reuse the foo example from above: + +``` +turnkey-apache-19.0 (1) turnkey; urgency=low +``` + +And must end with a signoff line, e.g.: + +``` + -- Jeremy Davis Tue, 01 Aug 2026 02:12:50 +0000 +``` + + +Generating Individual Appliance Changelogs +------------------------------------------ + +To generate the new appliance changelog format, ensure that the +'tkldev-detective' package is installed. I.e.: + +``` +apt update +apt install -y tkldev-detective +``` + +Once installed, in the base appliance build code directory (e.g. +'$FAB_PATH/products/lamp'), to create a new minor version changelog (e.g. +'18.1') run this: + +``` +tkldev-changelog -n +``` + +To create a new major version - e.g. 19.0, run this: + +``` +tkldev-changelog -N +``` + +To update an existing changelog entry: + +``` +tkldev-changelog -e +``` + +For more info, read the `tkldev-changelog --help`. + +Please note that currently, tkldev-changelog only supports 'vim' text editor. +If you are unfamiliar with vim (and can't be bothered learning it - which you +probably should...), then you can use the automation of tkldev-changelog to +generate the changelog with common entries, then save and exit vim using the +following key presses:: + + :wq + +Then re-open the file with your preferred editor to add appliance specific +entries. Be careful to ensure that the format is correct - you can double check +(and update the date) with: + +``` +tkldev-changelog --date +``` + +No error messages means everything is good! :) + + +Future Development +------------------ + +It is anticipated that in future we will likely explicitly generate the +exhaustive individual appliance changelogs at build time (and individual app +devs/maintainers can just do an app specific changelog). In the meantime, +changelogs will need to be generated semi-manually. diff --git a/changes/README.rst b/changes/README.rst deleted file mode 100644 index 2e20e518..00000000 --- a/changes/README.rst +++ /dev/null @@ -1,77 +0,0 @@ -Common Changelog Snippets -========================= - -These changelog snippets are to assist to automagically create exhaustive -appliance release changelog entries in TurnKey Linux v18.0+ appliances. -Previously (i.e. v17.x and before) common changes were noted only in the Core -changelog. - - -Filename & Format Specification -------------------------------- - -Changelog snippet files should be named:: - - COMMON/changes/COMMON_MAKFILE.changelog - -Where COMMON is the path to common ('$FAB_PATH/common/' - defaults to -'/turnkey/fab/common/') and COMMON_MAKFILE is the name of the relevant common -makefile (in 'COMMON/mk/turnkey/'). E.g. the changelog relating to -'mk/turnkey/apache.mk' is 'changes/apache.changelog' - -The contents must be formatted as per valid Debian changelog requirements. The -firstline of each new release entry should be in the following format:: - - turnkey-COMMON_MAKFILE_NAME-TKL_VERSION (1) turnkey; urgency=low - -E.g. to reuse the Apache example from above:: - - turnkey-apache-18.0 (1) turnkey; urgency=low - -And must end with a signoff line, e.g.:: - - -- Jeremy Davis Tue, 01 Aug 2023 02:12:50 +0000 - - -Generating Individual Appliance Changelogs ------------------------------------------- - -To generate the new exhaustive changelog format, install the -'tkldev-detective' package. I.e.:: - - apt update - apt install -y tkldev-detective - -Once installed, in the base appliance build code directory (e.g. -'$FAB_PATH/products/lamp'), to create a new minor version changelog (e.g. -'18.1') run this:: - - tkldev-changelog -n - -To create a new major version, run this:: - - tkldev-changelog -N - -To update an existing changelog entry:: - - tkldev-changelog -e - -For more info, read the 'tkldev-changelog' --help. - -Please note that currently, tkldev-changelog only supports 'vim' text editor. -If you are unfamiliar with vim (and can't be bothered learning it - which you -probably should...), then you can use the automation of tkldev-changelog to -generate the changelog with common entries, then save and exit vim using the -following key presses:: - - :wq - -Then re-open the file with your preferred editor to add appliance specific entries. - -Future Development ------------------- - -It is anticipated that in future we will likely explicitly generate the -exhaustive individual appliance changelogs at build time (and individual app -devs/maintainers can just do an app specific changelog). In the meantime, -changelogs will generated as needed.