diff --git a/AUTHORS.md b/AUTHORS.md index b96443b..6c8dae3 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|109 +@myii|[@myii](https://github.com/myii)|124 @alxwr|[@alxwr](https://github.com/alxwr)|40 @gravyboat|[@gravyboat](https://github.com/gravyboat)|36 @aboe76|[@aboe76](https://github.com/aboe76)|32 @@ -18,7 +18,7 @@ Avatar|Contributor|Contributions @techhat|[@techhat](https://github.com/techhat)|10 @landergate|[@landergate](https://github.com/landergate)|9 @bradthurber|[@bradthurber](https://github.com/bradthurber)|8 -@babilen5|[@babilen5](https://github.com/babilen5)|8 +@babilen|[@babilen](https://github.com/babilen)|8 @arthurlogilab|[@arthurlogilab](https://github.com/arthurlogilab)|7 @stp-ip|[@stp-ip](https://github.com/stp-ip)|7 @porunov|[@porunov](https://github.com/porunov)|7 @@ -63,6 +63,7 @@ Avatar|Contributor|Contributions @baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|1 @ev0rtex|[@ev0rtex](https://github.com/ev0rtex)|1 @dimitry-unified-streaming|[@dimitry-unified-streaming](https://github.com/dimitry-unified-streaming)|1 +@fniepelt|[@fniepelt](https://github.com/fniepelt)|1 @fintanmm|[@fintanmm](https://github.com/fintanmm)|1 @fcrozat|[@fcrozat](https://github.com/fcrozat)|1 @genaumann|[@genaumann](https://github.com/genaumann)|1 @@ -96,4 +97,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-06-28. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-08-28. diff --git a/CHANGELOG.md b/CHANGELOG.md index ff3b4f0..8c7e105 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +# [1.2.0](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.8...v1.2.0) (2021-08-28) + + +### Bug Fixes + +* **suse:** use correct vhostdir and sitesdir for suse family ([#369](https://github.com/saltstack-formulas/apache-formula/issues/369)) ([fe0ceb7](https://github.com/saltstack-formulas/apache-formula/commit/fe0ceb78b7d4e9f67bc4d5b684b847bdcc604b20)), closes [/documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2.html#sec-apache2](https://github.com//documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2.html/issues/sec-apache2) + + +### Continuous Integration + +* **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([2e116ec](https://github.com/saltstack-formulas/apache-formula/commit/2e116ec4123b846edd85b651c9634e03cb102abf)) +* **freebsd:** update with latest pre-salted Vagrant boxes [skip ci] ([d679580](https://github.com/saltstack-formulas/apache-formula/commit/d67958043df41515350a4b02c5de81e0d83eb813)) +* **gemfile+lock:** use `ssf` customised `inspec` repo [skip ci] ([5dd7009](https://github.com/saltstack-formulas/apache-formula/commit/5dd700944b413411fc3557063125f22c1eb6f62a)) +* **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([0d1a6dc](https://github.com/saltstack-formulas/apache-formula/commit/0d1a6dc75d1a781518bf4d7262dbfb4cfbc2c0b9)) +* **kitchen+ci:** update with latest `3003.2` pre-salted images [skip ci] ([d3641d7](https://github.com/saltstack-formulas/apache-formula/commit/d3641d7f0d427d9e8be9d20bd03f84977d1cba22)) +* add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([7741b90](https://github.com/saltstack-formulas/apache-formula/commit/7741b90ff66719c1abfca3fb306d07ee47cbd4c8)) + + +### Features + +* **alma+rocky:** add platforms (based on CentOS 8) [skip ci] ([4353e57](https://github.com/saltstack-formulas/apache-formula/commit/4353e57a1b652186f552472f16f1b06f8fb4f0a1)) + ## [1.1.8](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.7...v1.1.8) (2021-06-28) diff --git a/FORMULA b/FORMULA index a25a5e4..268aa1b 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: apache os: RedHat, Fedora, CentOS, Debian, Ubuntu, Suse, FreeBSD os_family: RedHat, Debian, Suse, FreeBSD -version: 1.1.8 +version: 1.2.0 release: 1 minimum_version: 2015.8 summary: Formula for installing Apache diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 42b8db0..54a4dd0 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 109 + - 124 * - :raw-html-m2r:`@alxwr` - `@alxwr `_ - 40 @@ -55,8 +55,8 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@bradthurber` - `@bradthurber `_ - 8 - * - :raw-html-m2r:`@babilen5` - - `@babilen5 `_ + * - :raw-html-m2r:`@babilen` + - `@babilen `_ - 8 * - :raw-html-m2r:`@arthurlogilab` - `@arthurlogilab `_ @@ -190,6 +190,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@dimitry-unified-streaming` - `@dimitry-unified-streaming `_ - 1 + * - :raw-html-m2r:`@fniepelt` + - `@fniepelt `_ + - 1 * - :raw-html-m2r:`@fintanmm` - `@fintanmm `_ - 1 @@ -284,4 +287,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-06-28. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-08-28. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 79d1603..9f2ce56 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog ========= +`1.2.0 `_ (2021-08-28) +-------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **suse:** use correct vhostdir and sitesdir for suse family (\ `#369 `_\ ) (\ `fe0ceb7 `_\ ), closes `/documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2.html#sec-apache2 `_ + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **3003.1:** update inc. AlmaLinux, Rocky & ``rst-lint`` [skip ci] (\ `2e116ec `_\ ) +* **freebsd:** update with latest pre-salted Vagrant boxes [skip ci] (\ `d679580 `_\ ) +* **gemfile+lock:** use ``ssf`` customised ``inspec`` repo [skip ci] (\ `5dd7009 `_\ ) +* **kitchen:** move ``provisioner`` block & update ``run_command`` [skip ci] (\ `0d1a6dc `_\ ) +* **kitchen+ci:** update with latest ``3003.2`` pre-salted images [skip ci] (\ `d3641d7 `_\ ) +* add Debian 11 Bullseye & update ``yamllint`` configuration [skip ci] (\ `7741b90 `_\ ) + +Features +^^^^^^^^ + + +* **alma+rocky:** add platforms (based on CentOS 8) [skip ci] (\ `4353e57 `_\ ) + `1.1.8 `_ (2021-06-28) -------------------------------------------------------------------------------------------------------- diff --git a/docs/antora.yml b/docs/antora.yml index 3b7c8b4..c512ec3 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,7 +1,7 @@ --- name: 'apache-formula' title: 'apache-formula' -version: '1.1.8' +version: '1.2.0' start_page: 'README.adoc' nav: - 'modules/ROOT/nav-repo-docs.adoc' diff --git a/docs/modules/ROOT/pages/AUTHORS.adoc b/docs/modules/ROOT/pages/AUTHORS.adoc index 301c4c6..3494b5d 100644 --- a/docs/modules/ROOT/pages/AUTHORS.adoc +++ b/docs/modules/ROOT/pages/AUTHORS.adoc @@ -12,7 +12,7 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/10231489?v=4[@myii,36,36] |https://github.com/myii[@myii^] -|109 +|124 |image::https://avatars.githubusercontent.com/u/1920805?v=4[@alxwr,36,36] |https://github.com/alxwr[@alxwr^] @@ -66,8 +66,8 @@ _descending_ order. |https://github.com/bradthurber[@bradthurber^] |8 -|image::https://avatars.githubusercontent.com/u/117961?v=4[@babilen5,36,36] -|https://github.com/babilen5[@babilen5^] +|image::https://avatars.githubusercontent.com/u/117961?v=4[@babilen,36,36] +|https://github.com/babilen[@babilen^] |8 |image::https://avatars.githubusercontent.com/u/445200?v=4[@arthurlogilab,36,36] @@ -247,6 +247,10 @@ _descending_ order. |1 +|image::https://avatars.githubusercontent.com/u/89458395?v=4[@fniepelt,36,36] +|https://github.com/fniepelt[@fniepelt^] +|1 + |image::https://avatars.githubusercontent.com/u/1194646?v=4[@fintanmm,36,36] |https://github.com/fintanmm[@fintanmm^] |1 @@ -372,4 +376,4 @@ _descending_ order. Auto-generated by a https://github.com/myii/maintainer[forked version^] of https://github.com/gaocegege/maintainer[gaocegege/maintainer^] on -2021-06-28. +2021-08-28. diff --git a/docs/modules/ROOT/pages/CHANGELOG.adoc b/docs/modules/ROOT/pages/CHANGELOG.adoc index a08053f..10503c9 100644 --- a/docs/modules/ROOT/pages/CHANGELOG.adoc +++ b/docs/modules/ROOT/pages/CHANGELOG.adoc @@ -2,6 +2,36 @@ :sectnums!: +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.8...v1.2.0++[1.2.0^] (2021-08-28) + +=== Bug Fixes + +* *suse:* use correct vhostdir and sitesdir for suse family +(https://github.com/saltstack-formulas/apache-formula/issues/369[#369^]) +(https://github.com/saltstack-formulas/apache-formula/commit/fe0ceb78b7d4e9f67bc4d5b684b847bdcc604b20[fe0ceb7^]), +closes +https://github.com//documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2.html/issues/sec-apache2[/documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2.html#sec-apache2^] + +=== Continuous Integration + +* *3003.1:* update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] +(https://github.com/saltstack-formulas/apache-formula/commit/2e116ec4123b846edd85b651c9634e03cb102abf[2e116ec^]) +* *freebsd:* update with latest pre-salted Vagrant boxes [skip ci] +(https://github.com/saltstack-formulas/apache-formula/commit/d67958043df41515350a4b02c5de81e0d83eb813[d679580^]) +* *gemfile+lock:* use `ssf` customised `inspec` repo [skip ci] +(https://github.com/saltstack-formulas/apache-formula/commit/5dd700944b413411fc3557063125f22c1eb6f62a[5dd7009^]) +* *kitchen:* move `provisioner` block & update `run_command` [skip ci] +(https://github.com/saltstack-formulas/apache-formula/commit/0d1a6dc75d1a781518bf4d7262dbfb4cfbc2c0b9[0d1a6dc^]) +* *kitchen+ci:* update with latest `3003.2` pre-salted images [skip ci] +(https://github.com/saltstack-formulas/apache-formula/commit/d3641d7f0d427d9e8be9d20bd03f84977d1cba22[d3641d7^]) +* add Debian 11 Bullseye & update `yamllint` configuration [skip ci] +(https://github.com/saltstack-formulas/apache-formula/commit/7741b90ff66719c1abfca3fb306d07ee47cbd4c8[7741b90^]) + +=== Features + +* *alma+rocky:* add platforms (based on CentOS 8) [skip ci] +(https://github.com/saltstack-formulas/apache-formula/commit/4353e57a1b652186f552472f16f1b06f8fb4f0a1[4353e57^]) + == link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.7...v1.1.8++[1.1.8^] (2021-06-28) === Bug Fixes