diff --git a/AUTHORS.md b/AUTHORS.md index c6d485fc..1a4806ed 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)|145 +@myii|[@myii](https://github.com/myii)|147 @alxwr|[@alxwr](https://github.com/alxwr)|40 @gravyboat|[@gravyboat](https://github.com/gravyboat)|36 @aboe76|[@aboe76](https://github.com/aboe76)|32 @@ -87,6 +87,7 @@ Avatar|Contributor|Contributions @wido|[@wido](https://github.com/wido)|1 @abehling|[@abehling](https://github.com/abehling)|1 @ardin|[@ardin](https://github.com/ardin)|1 +@l00d3r|[@l00d3r](https://github.com/l00d3r)|1 @mcarlton00|[@mcarlton00](https://github.com/mcarlton00)|1 @mschiff|[@mschiff](https://github.com/mschiff)|1 @nigelsim|[@nigelsim](https://github.com/nigelsim)|1 @@ -97,4 +98,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-10-20. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-10-28. diff --git a/CHANGELOG.md b/CHANGELOG.md index a404a5d8..c4ad0696 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.2.2](https://github.com/saltstack-formulas/apache-formula/compare/v1.2.1...v1.2.2) (2021-10-28) + + +### Bug Fixes + +* **redhat:** use correct vhostdir, sitesdir and logrotate script for redhat family ([#376](https://github.com/saltstack-formulas/apache-formula/issues/376)) ([c4b8538](https://github.com/saltstack-formulas/apache-formula/commit/c4b85381288ae878207ffa5d2cc36cabc916e8f1)) + ## [1.2.1](https://github.com/saltstack-formulas/apache-formula/compare/v1.2.0...v1.2.1) (2021-10-20) diff --git a/FORMULA b/FORMULA index f4ec202e..bfea1b91 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.2.1 +version: 1.2.2 release: 1 minimum_version: 2015.8 summary: Formula for installing Apache diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index ee4e7abd..20e60b85 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 `_ - - 145 + - 147 * - :raw-html-m2r:`@alxwr` - `@alxwr `_ - 40 @@ -262,6 +262,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@ardin` - `@ardin `_ - 1 + * - :raw-html-m2r:`@l00d3r` + - `@l00d3r `_ + - 1 * - :raw-html-m2r:`@mcarlton00` - `@mcarlton00 `_ - 1 @@ -287,4 +290,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-10-20. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-10-28. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index bc315926..d6e56d87 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`1.2.2 `_ (2021-10-28) +-------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **redhat:** use correct vhostdir, sitesdir and logrotate script for redhat family (\ `#376 `_\ ) (\ `c4b8538 `_\ ) + `1.2.1 `_ (2021-10-20) -------------------------------------------------------------------------------------------------------- diff --git a/docs/antora.yml b/docs/antora.yml index f169b869..319e45f5 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,7 +1,7 @@ --- name: 'apache-formula' title: 'apache-formula' -version: '1.2.1' +version: '1.2.2' 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 2f465e60..0be02ec7 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^] -|145 +|147 |image::https://avatars.githubusercontent.com/u/1920805?v=4[@alxwr,36,36] |https://github.com/alxwr[@alxwr^] @@ -343,6 +343,10 @@ _descending_ order. |https://github.com/ardin[@ardin^] |1 +|image::https://avatars.githubusercontent.com/u/45118187?v=4[@l00d3r,36,36] +|https://github.com/l00d3r[@l00d3r^] +|1 + |image::https://avatars.githubusercontent.com/u/17029228?v=4[@mcarlton00,36,36] |https://github.com/mcarlton00[@mcarlton00^] |1 @@ -376,4 +380,4 @@ _descending_ order. Auto-generated by a https://github.com/myii/maintainer[forked version^] of https://github.com/gaocegege/maintainer[gaocegege/maintainer^] on -2021-10-20. +2021-10-28. diff --git a/docs/modules/ROOT/pages/CHANGELOG.adoc b/docs/modules/ROOT/pages/CHANGELOG.adoc index 6d659ef3..432d0fa0 100644 --- a/docs/modules/ROOT/pages/CHANGELOG.adoc +++ b/docs/modules/ROOT/pages/CHANGELOG.adoc @@ -2,6 +2,15 @@ :sectnums!: +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.2.1...v1.2.2++[1.2.2^] (2021-10-28) + +=== Bug Fixes + +* *redhat:* use correct vhostdir, sitesdir and logrotate script for +redhat family +(https://github.com/saltstack-formulas/apache-formula/issues/376[#376^]) +(https://github.com/saltstack-formulas/apache-formula/commit/c4b85381288ae878207ffa5d2cc36cabc916e8f1[c4b8538^]) + == link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.2.0...v1.2.1++[1.2.1^] (2021-10-20) === Bug Fixes