diff --git a/AUTHORS.md b/AUTHORS.md index 91a0ceee..71852881 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)|101 +@myii|[@myii](https://github.com/myii)|102 @alxwr|[@alxwr](https://github.com/alxwr)|40 @gravyboat|[@gravyboat](https://github.com/gravyboat)|36 @aboe76|[@aboe76](https://github.com/aboe76)|32 @@ -81,6 +81,7 @@ Avatar|Contributor|Contributions @doublerr|[@doublerr](https://github.com/doublerr)|1 @netzvieh|[@netzvieh](https://github.com/netzvieh)|1 @skylerberg|[@skylerberg](https://github.com/skylerberg)|1 +@TiepiNL|[@TiepiNL](https://github.com/TiepiNL)|1 @wido|[@wido](https://github.com/wido)|1 @Yoda-BZH|[@Yoda-BZH](https://github.com/Yoda-BZH)|1 @abehling|[@abehling](https://github.com/abehling)|1 @@ -95,4 +96,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-05-08. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-05-14. diff --git a/CHANGELOG.md b/CHANGELOG.md index 030c7c70..f564e43f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.1.7](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.6...v1.1.7) (2021-05-14) + + +### Bug Fixes + +* **mod_pagespeed:** add missing colon to `file.directory` ([a8b87a5](https://github.com/saltstack-formulas/apache-formula/commit/a8b87a583e91b7f69cff8485cb56249c3707ce74)) + + +### Continuous Integration + +* add `arch-master` to matrix and update `.travis.yml` [skip ci] ([069388b](https://github.com/saltstack-formulas/apache-formula/commit/069388be3a624a91b955227188ddee7c3650045e)) + ## [1.1.6](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.5...v1.1.6) (2021-05-08) diff --git a/FORMULA b/FORMULA index 7789fa68..8ae29fe1 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.6 +version: 1.1.7 release: 1 minimum_version: 2015.8 summary: Formula for installing Apache diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 8e808e4b..85d57062 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 `_ - - 101 + - 102 * - :raw-html-m2r:`@alxwr` - `@alxwr `_ - 40 @@ -244,6 +244,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@skylerberg` - `@skylerberg `_ - 1 + * - :raw-html-m2r:`@TiepiNL` + - `@TiepiNL `_ + - 1 * - :raw-html-m2r:`@wido` - `@wido `_ - 1 @@ -281,4 +284,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-05-08. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-05-14. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 3dd863f4..562e6f6f 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,21 @@ Changelog ========= +`1.1.7 `_ (2021-05-14) +-------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **mod_pagespeed:** add missing colon to ``file.directory`` (\ `a8b87a5 `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* add ``arch-master`` to matrix and update ``.travis.yml`` [skip ci] (\ `069388b `_\ ) + `1.1.6 `_ (2021-05-08) -------------------------------------------------------------------------------------------------------- diff --git a/docs/antora.yml b/docs/antora.yml index 592ad4e9..66dd4e59 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,7 +1,7 @@ --- name: 'apache-formula' title: 'apache-formula' -version: '1.1.6' +version: '1.1.7' 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 d6777efe..00fe51dc 100644 --- a/docs/modules/ROOT/pages/AUTHORS.adoc +++ b/docs/modules/ROOT/pages/AUTHORS.adoc @@ -1,5 +1,4 @@ -Authors -------- += Authors This list is sorted by the number of commits per contributor in _descending_ order. @@ -13,28 +12,32 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/10231489?v=4[@myii,36,36] |https://github.com/myii[@myii^] -|101 +|102 + |image::https://avatars.githubusercontent.com/u/1920805?v=4[@alxwr,36,36] |https://github.com/alxwr[@alxwr^] |40 |image::https://avatars.githubusercontent.com/u/1396878?v=4[@gravyboat,36,36] |https://github.com/gravyboat[@gravyboat^] -|36 +|36 + |image::https://avatars.githubusercontent.com/u/1800660?v=4[@aboe76,36,36] |https://github.com/aboe76[@aboe76^] |32 |image::https://avatars.githubusercontent.com/u/91293?v=4[@whiteinge,36,36] |https://github.com/whiteinge[@whiteinge^] -|31 +|31 + |image::https://avatars.githubusercontent.com/u/13322818?v=4[@noelmcloughlin,36,36] |https://github.com/noelmcloughlin[@noelmcloughlin^] -|29 +|29 |image::https://avatars.githubusercontent.com/u/242396?v=4[@javierbertoli,36,36] |https://github.com/javierbertoli[@javierbertoli^] -|27 +|27 + |image::https://avatars.githubusercontent.com/u/3374962?v=4[@nmadhok,36,36] |https://github.com/nmadhok[@nmadhok^] |20 @@ -42,34 +45,39 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/528061?v=4[@puneetk,36,36] |https://github.com/puneetk[@puneetk^] |20 + |image::https://avatars.githubusercontent.com/u/214768?v=4[@ixs,36,36] |https://github.com/ixs[@ixs^] |10 |image::https://avatars.githubusercontent.com/u/458548?v=4[@SuperTux88,36,36] |https://github.com/SuperTux88[@SuperTux88^] -|10 +|10 + |image::https://avatars.githubusercontent.com/u/287147?v=4[@techhat,36,36] |https://github.com/techhat[@techhat^] |10 |image::https://avatars.githubusercontent.com/u/904839?v=4[@landergate,36,36] |https://github.com/landergate[@landergate^] -|9 +|9 + |image::https://avatars.githubusercontent.com/u/3045456?v=4[@bradthurber,36,36] |https://github.com/bradthurber[@bradthurber^] -|8 +|8 |image::https://avatars.githubusercontent.com/u/117961?v=4[@babilen5,36,36] |https://github.com/babilen5[@babilen5^] |8 + |image::https://avatars.githubusercontent.com/u/445200?v=4[@arthurlogilab,36,36] |https://github.com/arthurlogilab[@arthurlogilab^] -|7 +|7 |image::https://avatars.githubusercontent.com/u/3768412?v=4[@stp-ip,36,36] |https://github.com/stp-ip[@stp-ip^] |7 + |image::https://avatars.githubusercontent.com/u/17673243?v=4[@porunov,36,36] |https://github.com/porunov[@porunov^] |7 @@ -77,13 +85,15 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/3119969?v=4[@genuss,36,36] |https://github.com/genuss[@genuss^] |6 + |image::https://avatars.githubusercontent.com/u/5759396?v=4[@kadogo,36,36] |https://github.com/kadogo[@kadogo^] |6 |image::https://avatars.githubusercontent.com/u/637990?v=4[@bmwiedemann,36,36] |https://github.com/bmwiedemann[@bmwiedemann^] -|5 +|5 + |image::https://avatars.githubusercontent.com/u/48491?v=4[@eliasp,36,36] |https://github.com/eliasp[@eliasp^] |5 @@ -91,6 +101,7 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/65311?v=4[@multani,36,36] |https://github.com/multani[@multani^] |5 + |image::https://avatars.githubusercontent.com/u/1013915?v=4[@rhertzog,36,36] |https://github.com/rhertzog[@rhertzog^] |4 @@ -98,13 +109,15 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/20515?v=4[@scambra,36,36] |https://github.com/scambra[@scambra^] |4 + |image::https://avatars.githubusercontent.com/u/2094680?v=4[@daschatten,36,36] |https://github.com/daschatten[@daschatten^] -|4 +|4 |image::https://avatars.githubusercontent.com/u/1744181?v=4[@adherzog,36,36] |https://github.com/adherzog[@adherzog^] |3 + |image::https://avatars.githubusercontent.com/u/2192630?v=4[@abrefort,36,36] |https://github.com/abrefort[@abrefort^] |3 @@ -112,6 +125,7 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/1507504?v=4[@arnisoph,36,36] |https://github.com/arnisoph[@arnisoph^] |3 + |image::https://avatars.githubusercontent.com/u/4195158?v=4[@dafyddj,36,36] |https://github.com/dafyddj[@dafyddj^] |3 @@ -119,48 +133,55 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/312493?v=4[@opdude,36,36] |https://github.com/opdude[@opdude^] |3 + |image::https://avatars.githubusercontent.com/u/10925856?v=4[@louis-haddrell,36,36] |https://github.com/louis-haddrell[@louis-haddrell^] -|3 +|3 |image::https://avatars.githubusercontent.com/u/964610?v=4[@Wenzel,36,36] |https://github.com/Wenzel[@Wenzel^] |3 + |image::https://avatars.githubusercontent.com/u/228723?v=4[@abednarik,36,36] |https://github.com/abednarik[@abednarik^] -|3 +|3 |image::https://avatars.githubusercontent.com/u/12513495?v=4[@dexbleeker,36,36] |https://github.com/dexbleeker[@dexbleeker^] -|3 +|3 + |image::https://avatars.githubusercontent.com/u/112249?v=4[@vincentfretin,36,36] |https://github.com/vincentfretin[@vincentfretin^] -|3 +|3 |image::https://avatars.githubusercontent.com/u/1079875?v=4[@bogdanr,36,36] |https://github.com/bogdanr[@bogdanr^] |2 + |image::https://avatars.githubusercontent.com/u/11229682?v=4[@carlovollebregt,36,36] |https://github.com/carlovollebregt[@carlovollebregt^] -|2 +|2 |image::https://avatars.githubusercontent.com/u/4313010?v=4[@thornycrackers,36,36] |https://github.com/thornycrackers[@thornycrackers^] -|2 +|2 + |image::https://avatars.githubusercontent.com/u/29622411?v=4[@gaetanars,36,36] |https://github.com/gaetanars[@gaetanars^] -|2 +|2 |image::https://avatars.githubusercontent.com/u/7060082?v=4[@msciciel,36,36] |https://github.com/msciciel[@msciciel^] |2 + |image::https://avatars.githubusercontent.com/u/485400?v=4[@actionjack,36,36] |https://github.com/actionjack[@actionjack^] -|2 +|2 |image::https://avatars.githubusercontent.com/u/316108?v=4[@mosen,36,36] |https://github.com/mosen[@mosen^] |2 + |image::https://avatars.githubusercontent.com/u/1244954?v=4[@RyPeck,36,36] |https://github.com/RyPeck[@RyPeck^] |2 @@ -168,6 +189,7 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/507599?v=4[@thatch45,36,36] |https://github.com/thatch45[@thatch45^] |2 + |image::https://avatars.githubusercontent.com/u/19413421?v=4[@tibberg,36,36] |https://github.com/tibberg[@tibberg^] |2 @@ -175,13 +197,15 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/15383526?v=4[@emeygret,36,36] |https://github.com/emeygret[@emeygret^] |2 + |image::https://avatars.githubusercontent.com/u/3609179?v=4[@artmoni,36,36] |https://github.com/artmoni[@artmoni^] |2 |image::https://avatars.githubusercontent.com/u/5512529?v=4[@alexfrosa,36,36] |https://github.com/alexfrosa[@alexfrosa^] -|2 +|2 + |image::https://avatars.githubusercontent.com/u/20859482?v=4[@jhops-ab,36,36] |https://github.com/jhops-ab[@jhops-ab^] |1 @@ -189,6 +213,7 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/7612102?v=4[@isntall,36,36] |https://github.com/isntall[@isntall^] |1 + |image::https://avatars.githubusercontent.com/u/863137?v=4[@benjy,36,36] |https://github.com/benjy[@benjy^] |1 @@ -196,13 +221,15 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/20441?v=4[@iggy,36,36] |https://github.com/iggy[@iggy^] |1 + |image::https://avatars.githubusercontent.com/u/47893434?v=4[@chorne-togetherwork,36,36] |https://github.com/chorne-togetherwork[@chorne-togetherwork^] -|1 +|1 |image::https://avatars.githubusercontent.com/u/130219?v=4[@corywright,36,36] |https://github.com/corywright[@corywright^] -|1 +|1 + |image::https://avatars.githubusercontent.com/u/1233212?v=4[@baby-gnu,36,36] |https://github.com/baby-gnu[@baby-gnu^] |1 @@ -210,20 +237,24 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/1640672?v=4[@ev0rtex,36,36] |https://github.com/ev0rtex[@ev0rtex^] |1 + |image::https://avatars.githubusercontent.com/u/42472863?v=4[@dimitry-unified-streaming,36,36] |https://github.com/dimitry-unified-streaming[@dimitry-unified-streaming^] + |1 |image::https://avatars.githubusercontent.com/u/1194646?v=4[@fintanmm,36,36] |https://github.com/fintanmm[@fintanmm^] |1 + |image::https://avatars.githubusercontent.com/u/215487?v=4[@fcrozat,36,36] |https://github.com/fcrozat[@fcrozat^] |1 |image::https://avatars.githubusercontent.com/u/38090329?v=4[@genaumann,36,36] |https://github.com/genaumann[@genaumann^] -|1 +|1 + |image::https://avatars.githubusercontent.com/u/41886?v=4[@jbouse,36,36] |https://github.com/jbouse[@jbouse^] |1 @@ -231,6 +262,7 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/377632?v=4[@jerrykan,36,36] |https://github.com/jerrykan[@jerrykan^] |1 + |image::https://avatars.githubusercontent.com/u/3703806?v=4[@jcristau,36,36] |https://github.com/jcristau[@jcristau^] |1 @@ -238,6 +270,7 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/5655231?v=4[@kpostrup,36,36] |https://github.com/kpostrup[@kpostrup^] |1 + |image::https://avatars.githubusercontent.com/u/783794?v=4[@morsik,36,36] |https://github.com/morsik[@morsik^] |1 @@ -245,6 +278,7 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/22311?v=4[@madssj,36,36] |https://github.com/madssj[@madssj^] |1 + |image::https://avatars.githubusercontent.com/u/201711?v=4[@mariusvw,36,36] |https://github.com/mariusvw[@mariusvw^] |1 @@ -252,13 +286,15 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/1106959?v=4[@mpeeters,36,36] |https://github.com/mpeeters[@mpeeters^] |1 + |image::https://avatars.githubusercontent.com/u/7139195?v=4[@xenophonf,36,36] |https://github.com/xenophonf[@xenophonf^] -|1 +|1 |image::https://avatars.githubusercontent.com/u/393545?v=4[@mshade,36,36] |https://github.com/mshade[@mshade^] |1 + |image::https://avatars.githubusercontent.com/u/1829924?v=4[@fujexo,36,36] |https://github.com/fujexo[@fujexo^] |1 @@ -266,6 +302,7 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/219695?v=4[@rmoorman,36,36] |https://github.com/rmoorman[@rmoorman^] |1 + |image::https://avatars.githubusercontent.com/u/1647923?v=4[@robruma,36,36] |https://github.com/robruma[@robruma^] |1 @@ -273,13 +310,19 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/1554646?v=4[@doublerr,36,36] |https://github.com/doublerr[@doublerr^] |1 + |image::https://avatars.githubusercontent.com/u/3667731?v=4[@netzvieh,36,36] |https://github.com/netzvieh[@netzvieh^] |1 |image::https://avatars.githubusercontent.com/u/4156131?v=4[@skylerberg,36,36] |https://github.com/skylerberg[@skylerberg^] +|1 + +|image::https://avatars.githubusercontent.com/u/7967223?v=4[@TiepiNL,36,36] +|https://github.com/TiepiNL[@TiepiNL^] |1 + |image::https://avatars.githubusercontent.com/u/326786?v=4[@wido,36,36] |https://github.com/wido[@wido^] |1 @@ -287,6 +330,7 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/751889?v=4[@Yoda-BZH,36,36] |https://github.com/Yoda-BZH[@Yoda-BZH^] |1 + |image::https://avatars.githubusercontent.com/u/9978732?v=4[@abehling,36,36] |https://github.com/abehling[@abehling^] |1 @@ -294,13 +338,15 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/1021809?v=4[@ardin,36,36] |https://github.com/ardin[@ardin^] |1 + |image::https://avatars.githubusercontent.com/u/17029228?v=4[@mcarlton00,36,36] |https://github.com/mcarlton00[@mcarlton00^] -|1 +|1 |image::https://avatars.githubusercontent.com/u/924183?v=4[@mschiff,36,36] |https://github.com/mschiff[@mschiff^] |1 + |image::https://avatars.githubusercontent.com/u/2869?v=4[@nigelsim,36,36] |https://github.com/nigelsim[@nigelsim^] |1 @@ -308,13 +354,15 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/55587680?v=4[@srse,36,36] |https://github.com/srse[@srse^] |1 + |image::https://avatars.githubusercontent.com/u/46799934?v=4[@sticky-note,36,36] |https://github.com/sticky-note[@sticky-note^] -|1 +|1 |image::https://avatars.githubusercontent.com/u/18380701?v=4[@tsenay,36,36] |https://github.com/tsenay[@tsenay^] |1 + |image::https://avatars.githubusercontent.com/u/2089076?v=4[@ze42,36,36] |https://github.com/ze42[@ze42^] |1 @@ -324,4 +372,4 @@ _descending_ order. Auto-generated by a https://github.com/myii/maintainer[forked version^] of https://github.com/gaocegege/maintainer[gaocegege/maintainer^] on -2021-05-08. +2021-05-14. diff --git a/docs/modules/ROOT/pages/CHANGELOG.adoc b/docs/modules/ROOT/pages/CHANGELOG.adoc index 8a475dff..24dbe031 100644 --- a/docs/modules/ROOT/pages/CHANGELOG.adoc +++ b/docs/modules/ROOT/pages/CHANGELOG.adoc @@ -1,40 +1,41 @@ -Changelog += Changelog :sectnums!: ---------- -https://github.com/saltstack-formulas/apache-formula/compare/v1.1.5...v1.1.6[1.1.6^] -(2021-05-08) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.6...v1.1.7++[1.1.7^] (2021-05-14) -Documentation -^^^^^^^^^^^^^ +=== Bug Fixes + +* *mod_pagespeed:* add missing colon to `file.directory` +(https://github.com/saltstack-formulas/apache-formula/commit/a8b87a583e91b7f69cff8485cb56249c3707ce74[a8b87a5^]) + +=== Continuous Integration + +* add `arch-master` to matrix and update `.travis.yml` [skip ci] +(https://github.com/saltstack-formulas/apache-formula/commit/069388be3a624a91b955227188ddee7c3650045e[069388b^]) + +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.5...v1.1.6++[1.1.6^] (2021-05-08) + +=== Documentation * *changelog:* regenerate via. `semantic-release` (https://github.com/saltstack-formulas/apache-formula/commit/de8c82c7533e36e720cf2e44c46154cd8cd3f540[de8c82c^]) -https://github.com/saltstack-formulas/apache-formula/compare/v1.1.4...v1.1.5[1.1.5^] -(2021-05-08) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.4...v1.1.5++[1.1.5^] (2021-05-08) -Documentation -^^^^^^^^^^^^^ +=== Documentation * *changelog:* regenerate via. `semantic-release` (https://github.com/saltstack-formulas/apache-formula/commit/198d525a6a552c8c83842c26f6c74a43ffcd4b79[198d525^]) -https://github.com/saltstack-formulas/apache-formula/compare/v1.1.3...v1.1.4[1.1.4^] -(2021-05-08) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.3...v1.1.4++[1.1.4^] (2021-05-08) -Continuous Integration -^^^^^^^^^^^^^^^^^^^^^^ +=== Continuous Integration * *gitlab-ci:* remove adjustments made during Antora test [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/0c7082f8d911185390e8ab03077f61c6027461f7[0c7082f^]) -Documentation -^^^^^^^^^^^^^ +=== Documentation * *changelog:* regenerate via. `semantic-release` (https://github.com/saltstack-formulas/apache-formula/commit/e1f1fa7d8f3ea5a8c307badcfe890f96f57c580f[e1f1fa7^]) @@ -43,20 +44,16 @@ Documentation * *changelog:* regenerate via. `semantic-release` (https://github.com/saltstack-formulas/apache-formula/commit/56efd35f85fe049b4cdcbd082e38d547bd306a39[56efd35^]) -https://github.com/saltstack-formulas/apache-formula/compare/v1.1.2...v1.1.3[1.1.3^] -(2021-04-30) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.2...v1.1.3++[1.1.3^] (2021-04-30) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *config/vhosts/standard:* remove erroneous trailing colon (https://github.com/saltstack-formulas/apache-formula/commit/dedb9e2f400aa9d391ae39c22f8a4fec1e7bc220[dedb9e2^]), closes https://github.com/saltstack-formulas/apache-formula/issues/302[#302^] -Continuous Integration -^^^^^^^^^^^^^^^^^^^^^^ +=== Continuous Integration * *kitchen+gitlab:* adjust matrix to add `3003` [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/3c21740ba52fa5c2b5cf39cddce6a42d13d17988[3c21740^]) @@ -65,20 +62,16 @@ Continuous Integration * *vagrant:* use pre-salted boxes & conditional local settings [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/f354ace8e7d328580a60dbc09703ddc54a6af0a0[f354ace^]) -https://github.com/saltstack-formulas/apache-formula/compare/v1.1.1...v1.1.2[1.1.2^] -(2021-04-03) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.1...v1.1.2++[1.1.2^] (2021-04-03) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *freebsd:* fix `default` suite implementation and tests (https://github.com/saltstack-formulas/apache-formula/commit/0a0f69ee2fc8168696f9f9c4ae786389ff894615[0a0f69e^]) * *freebsd:* fix `modsecurity` suite implementation and tests (https://github.com/saltstack-formulas/apache-formula/commit/bc9aa78437d14cf26605f58a3c1e17caed8f05bc[bc9aa78^]) -Continuous Integration -^^^^^^^^^^^^^^^^^^^^^^ +=== Continuous Integration * enable Vagrant-based testing using GitHub Actions (https://github.com/saltstack-formulas/apache-formula/commit/6e094e2527748cd4d72690b9289836b17f9289c7[6e094e2^]) @@ -93,32 +86,26 @@ Continuous Integration * *pre-commit:* update hook for `rubocop` (https://github.com/saltstack-formulas/apache-formula/commit/2c090c3a835e42bd07f0788f4b0965f1c3405662[2c090c3^]) -Documentation -^^^^^^^^^^^^^ +=== Documentation * *readme:* add `Testing with Vagrant` section (https://github.com/saltstack-formulas/apache-formula/commit/5a6b203bb18f9f28146f33af8175fc3b8c059077[5a6b203^]) -Tests -^^^^^ +=== Tests * standardise use of `share` suite & `_mapdata` state [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/e7c2d20f06f23a5ce8a5edaae513775aca0914ab[e7c2d20^]) * *nomodsecurity:* use adjusted `modules` suite instead (https://github.com/saltstack-formulas/apache-formula/commit/838b9172217c5e067ea0e4a6d2f155ecd1a4b053[838b917^]) -https://github.com/saltstack-formulas/apache-formula/compare/v1.1.0...v1.1.1[1.1.1^] -(2021-01-04) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.0...v1.1.1++[1.1.1^] (2021-01-04) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *memory:* pass variable not dict (https://github.com/saltstack-formulas/apache-formula/commit/28300814fc0a83244ab64a4a87f104d67de4ac53[2830081^]) -Continuous Integration -^^^^^^^^^^^^^^^^^^^^^^ +=== Continuous Integration * *commitlint:* ensure `upstream/master` uses main repo URL [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/0145922b52f21469c00c85bf46503411ffd11c56[0145922^]) @@ -127,58 +114,45 @@ Continuous Integration * *gitlab-ci:* use GitLab CI as Travis CI replacement (https://github.com/saltstack-formulas/apache-formula/commit/26208c47c644608b00adfa8474616305e7a55e36[26208c4^]) -https://github.com/saltstack-formulas/apache-formula/compare/v1.0.5...v1.1.0[1.1.0^] -(2020-10-14) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.0.5...v1.1.0++[1.1.0^] (2020-10-14) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *ssl.conf:* fix pillar keys for SSLStapling in ssl.conf on debian (https://github.com/saltstack-formulas/apache-formula/commit/65043f8a6142f7b9988cd406988b524aa9f0a1f2[65043f8^]) -Code Refactoring -^^^^^^^^^^^^^^^^ +=== Code Refactoring * *ssl.conf:* reduce newlines in ssl.conf on debian (https://github.com/saltstack-formulas/apache-formula/commit/b99b7b71add9fc1102d1b62eafada8358dfd5e68[b99b7b7^]) * *vhosts:* reduce empty lines in standard.tmpl and proxy.tmpl (https://github.com/saltstack-formulas/apache-formula/commit/4b79c1dddb1999452b618153792a8710bedbb76e[4b79c1d^]) -Features -^^^^^^^^ +=== Features * *ssl.conf:* add SSLSessionTickets to ssl.conf on debian (https://github.com/saltstack-formulas/apache-formula/commit/41a7a83af0bf1bf4d4dde0f8ea522135dd721738[41a7a83^]) -https://github.com/saltstack-formulas/apache-formula/compare/v1.0.4...v1.0.5[1.0.5^] -(2020-10-14) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.0.4...v1.0.5++[1.0.5^] (2020-10-14) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *clean:* remove entire apache config directory (https://github.com/saltstack-formulas/apache-formula/commit/cac5f357a47d1bdd40371aca97181b490430c158[cac5f35^]) -Code Refactoring -^^^^^^^^^^^^^^^^ +=== Code Refactoring * *package:* remove unnecessary state (https://github.com/saltstack-formulas/apache-formula/commit/fb81d8e69450702bcd3eaa6e5243fce02715c819[fb81d8e^]) -Documentation -^^^^^^^^^^^^^ +=== Documentation * *readme:* add mod watchdog to pillar example (https://github.com/saltstack-formulas/apache-formula/commit/e0043dd7bafcab1b87822d0c831b91e10936b291[e0043dd^]) -https://github.com/saltstack-formulas/apache-formula/compare/v1.0.3...v1.0.4[1.0.4^] -(2020-10-14) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.0.3...v1.0.4++[1.0.4^] (2020-10-14) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *debian:* don't execute a2enmod on every run (https://github.com/saltstack-formulas/apache-formula/commit/5844322de46b82cad6beedd2b99c8808df8f2485[5844322^]) @@ -189,46 +163,35 @@ Bug Fixes * *vhosts:* replace %O with %b in default LogFormat (https://github.com/saltstack-formulas/apache-formula/commit/2b52e11a8a91b0837a442bac816e7383dbe6fb13[2b52e11^]) -Tests -^^^^^ +=== Tests * *pillar:* remove modules that aren't installed from being enabled (https://github.com/saltstack-formulas/apache-formula/commit/47ec5fcc343ea889898e2418cd7c03a4a75c8f87[47ec5fc^]) -https://github.com/saltstack-formulas/apache-formula/compare/v1.0.2...v1.0.3[1.0.3^] -(2020-10-13) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.0.2...v1.0.3++[1.0.3^] (2020-10-13) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *config:* fix old apache.service usage (https://github.com/saltstack-formulas/apache-formula/commit/32f05e5a66940ad86ce21831598c478b7099ed3a[32f05e5^]) -https://github.com/saltstack-formulas/apache-formula/compare/v1.0.1...v1.0.2[1.0.2^] -(2020-10-12) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.0.1...v1.0.2++[1.0.2^] (2020-10-12) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *package:* remove own_default_vhost and debian_full from config.init (https://github.com/saltstack-formulas/apache-formula/commit/7691b589d7a1b0a87aaf9b13282e6ca154c5787c[7691b58^]) * *package:* remove own_default_vhost and debian_full from config.init (https://github.com/saltstack-formulas/apache-formula/commit/441459e56f3a8b091671839042efae2d7020380d[441459e^]) -https://github.com/saltstack-formulas/apache-formula/compare/v1.0.0...v1.0.1[1.0.1^] -(2020-10-10) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.0.0...v1.0.1++[1.0.1^] (2020-10-10) -Continuous Integration -^^^^^^^^^^^^^^^^^^^^^^ +=== Continuous Integration * *pre-commit:* finalise `rstcheck` configuration [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/1c2125c251016097e7d2c0694bf0245a3644605e[1c2125c^]) -Documentation -^^^^^^^^^^^^^ +=== Documentation * *example:* document redirect 80->443 fix https://github.com/saltstack-formulas/apache-formula/issues/226[#226^] @@ -238,26 +201,21 @@ https://github.com/saltstack-formulas/apache-formula/issues/226[#226^] closes https://github.com//travis-ci.org/github/myii/apache-formula/builds/731605038/issues/L255[/travis-ci.org/github/myii/apache-formula/builds/731605038#L255^] -https://github.com/saltstack-formulas/apache-formula/compare/v0.41.1...v1.0.0[1.0.0^] -(2020-10-05) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.41.1...v1.0.0++[1.0.0^] (2020-10-05) -Code Refactoring -^^^^^^^^^^^^^^^^ +=== Code Refactoring * *formula:* align to template-formula & improve ci features (https://github.com/saltstack-formulas/apache-formula/commit/47818fc360fc87c94f51f2c2c7ff9317d4ecf875[47818fc^]) -Continuous Integration -^^^^^^^^^^^^^^^^^^^^^^ +=== Continuous Integration * *pre-commit:* add to formula [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/5532ed7a5b1c9afb5ca4348d3984c5ff357bacad[5532ed7^]) * *pre-commit:* enable/disable `rstcheck` as relevant [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/233111af11dd25b573928e746f19b06bcdbf19b9[233111a^]) -BREAKING CHANGES -^^^^^^^^^^^^^^^^ +=== BREAKING CHANGES * *formula:* 'apache.sls' converted to new style 'init.ssl' * *formula:* "logrotate.sls" became "config/logrotate.sls" @@ -275,58 +233,44 @@ BREAKING CHANGES NOT-BREAKING CHANGE: 'config.sls' became 'config/init.sls' NOT-BREAKING CHANGE: 'uninstall.sls' symlinked to 'clean.sls' -https://github.com/saltstack-formulas/apache-formula/compare/v0.41.0...v0.41.1[0.41.1^] -(2020-07-20) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.41.0...v0.41.1++[0.41.1^] (2020-07-20) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *server-status:* enable module in Debian family (https://github.com/saltstack-formulas/apache-formula/commit/632802a5a946d2f05c40d9038d6f2ad596fafc58[632802a^]) * *server-status:* manage module in debian (https://github.com/saltstack-formulas/apache-formula/commit/eafa4196d9495bc975c7e1e7036969bdaba1441d[eafa419^]) -Tests -^^^^^ +=== Tests * *default+modules:* add modules' tests suite (https://github.com/saltstack-formulas/apache-formula/commit/b25362535ae01dd140218b131a8e991d3a10cbe5[b253625^]) -https://github.com/saltstack-formulas/apache-formula/compare/v0.40.0...v0.41.0[0.41.0^] -(2020-07-16) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.40.0...v0.41.0++[0.41.0^] (2020-07-16) -Features -^^^^^^^^ +=== Features * *vhosts/standard:* add support for ScriptAlias in standard vhost (https://github.com/saltstack-formulas/apache-formula/commit/b88b437308ff5d6bc504dabf9b69153db89f5b10[b88b437^]) -https://github.com/saltstack-formulas/apache-formula/compare/v0.39.5...v0.40.0[0.40.0^] -(2020-07-16) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.39.5...v0.40.0++[0.40.0^] (2020-07-16) -Features -^^^^^^^^ +=== Features * *redhat/apache-2.x.config.jinja:* allow override of default_charset (https://github.com/saltstack-formulas/apache-formula/commit/648f589cc30684550c972d9cc4087e9e8b3fdc80[648f589^]) -https://github.com/saltstack-formulas/apache-formula/compare/v0.39.4...v0.39.5[0.39.5^] -(2020-06-21) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.39.4...v0.39.5++[0.39.5^] (2020-06-21) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *vhosts/cleanup:* check `sites-enabled` dir exists before listing it (https://github.com/saltstack-formulas/apache-formula/commit/88373e38f55eab61cf1c4edc68324f3da48f7646[88373e3^]), closes https://github.com/saltstack-formulas/apache-formula/issues/278[#278^] -Continuous Integration -^^^^^^^^^^^^^^^^^^^^^^ +=== Continuous Integration * *gemfile.lock:* add to repo with updated `Gemfile` [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/61b903e7803eb80b50130834b90ca86d26b9d6c8[61b903e^]) @@ -339,60 +283,44 @@ Continuous Integration * *workflows/commitlint:* add to repo [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/2ce966d031e9044e8794dc93f605ce780fd99f12[2ce966d^]) -https://github.com/saltstack-formulas/apache-formula/compare/v0.39.3...v0.39.4[0.39.4^] -(2020-04-02) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.39.3...v0.39.4++[0.39.4^] (2020-04-02) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *mod_ssl:* update mod_ssl package variable to prevent clashes (https://github.com/saltstack-formulas/apache-formula/commit/5591be26fddd234ebaed0e024969c45b6536ba82[5591be2^]) -https://github.com/saltstack-formulas/apache-formula/compare/v0.39.2...v0.39.3[0.39.3^] -(2020-04-02) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.39.2...v0.39.3++[0.39.3^] (2020-04-02) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *debian:* generate remoteip conf before a2enconf (https://github.com/saltstack-formulas/apache-formula/commit/1ed69f6c6fab0eb583949105e9e29e58b6ba32a3[1ed69f6^]) -Continuous Integration -^^^^^^^^^^^^^^^^^^^^^^ +=== Continuous Integration * *kitchen:* avoid using bootstrap for `master` instances [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/275b5d5e69fa79f1010852d65f0fcb65cadf735d[275b5d5^]) * *travis:* use `major.minor` for `semantic-release` version [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/08cced29134ca47824e82ee6afa794233cdb5faa[08cced2^]) -https://github.com/saltstack-formulas/apache-formula/compare/v0.39.1...v0.39.2[0.39.2^] -(2019-12-20) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.39.1...v0.39.2++[0.39.2^] (2019-12-20) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *redhat:* add user & group lookup to configs (https://github.com/saltstack-formulas/apache-formula/commit/36ad2b24424936a4badeb7b4b2b26ee0d39e55f2[36ad2b2^]) -https://github.com/saltstack-formulas/apache-formula/compare/v0.39.0...v0.39.1[0.39.1^] -(2019-12-20) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.39.0...v0.39.1++[0.39.1^] (2019-12-20) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *mod_mpm:* cast to int to avoid Jinja type mismatch error (https://github.com/saltstack-formulas/apache-formula/commit/21045c7a7b46d639c2d81c5793ad6e6d9d34b66b[21045c7^]) -https://github.com/saltstack-formulas/apache-formula/compare/v0.38.2...v0.39.0[0.39.0^] -(2019-12-20) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.38.2...v0.39.0++[0.39.0^] (2019-12-20) -Continuous Integration -^^^^^^^^^^^^^^^^^^^^^^ +=== Continuous Integration * *gemfile:* restrict `train` gem version until upstream fix [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/13be6f9fac5aae55c48f74c784335c61d7fbaaf2[13be6f9^]) @@ -407,36 +335,28 @@ Continuous Integration * *travis:* use build config validation (beta) [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/73160b249124df6bbd36b113df71724c019a118f[73160b2^]) -Features -^^^^^^^^ +=== Features * *server-status:* allow remote servers to reach server-status page (https://github.com/saltstack-formulas/apache-formula/commit/a3c0022d7988eee0ec43d939bced91dee9fec0e1[a3c0022^]) -https://github.com/saltstack-formulas/apache-formula/compare/v0.38.1...v0.38.2[0.38.2^] -(2019-11-07) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.38.1...v0.38.2++[0.38.2^] (2019-11-07) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *apache/modules.sls:* fix duplicated ID (https://github.com/saltstack-formulas/apache-formula/commit/57afd71627eb554138c8d5ec9cc790d899ed80ff[57afd71^]) -https://github.com/saltstack-formulas/apache-formula/compare/v0.38.0...v0.38.1[0.38.1^] -(2019-11-05) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.38.0...v0.38.1++[0.38.1^] (2019-11-05) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *mod_perl2.sls:* fix a2enmod perl2 error (https://github.com/saltstack-formulas/apache-formula/commit/fba8d217944c8b5a0abf19cdbae7d41d1ec5bf2e[fba8d21^]) * *release.config.js:* use full commit hash in commit link [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/dc5593cfdf775e065ea5f680f2ed2b6b7c80d8ed[dc5593c^]) -Continuous Integration -^^^^^^^^^^^^^^^^^^^^^^ +=== Continuous Integration * *kitchen:* use `debian-10-master-py3` instead of `develop` [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/09d82a581caa09298d3d99ded215c5e45c5b619f[09d82a5^]) @@ -448,18 +368,14 @@ Continuous Integration * *travis:* update `salt-lint` config for `v0.0.10` [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/2622d48b4ccb01cd70555d46759d79d82d1db7bf[2622d48^]) -Performance Improvements -^^^^^^^^^^^^^^^^^^^^^^^^ +=== Performance Improvements * *travis:* improve `salt-lint` invocation [skip ci] (https://github.com/saltstack-formulas/apache-formula/commit/bf7577022040a155de8b3ab4f557dd05484d278c[bf75770^]) -https://github.com/saltstack-formulas/apache-formula/compare/v0.37.4...v0.38.0[0.38.0^] -(2019-10-20) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.37.4...v0.38.0++[0.38.0^] (2019-10-20) -Bug Fixes -^^^^^^^^^ +=== Bug Fixes * *apache-2.2.config.jinja:* fix `salt-lint` errors (https://github.com/saltstack-formulas/apache-formula/commit/f4045ef[f4045ef^]) @@ -494,22 +410,19 @@ Bug Fixes * *yamllint:* fix all errors (https://github.com/saltstack-formulas/apache-formula/commit/97f6ead[97f6ead^]) -Documentation -^^^^^^^^^^^^^ +=== Documentation * *formula:* use standard structure (https://github.com/saltstack-formulas/apache-formula/commit/701929d[701929d^]) * *readme:* move to `docs/` directory and modify accordingly (https://github.com/saltstack-formulas/apache-formula/commit/6933f0e[6933f0e^]) -Features -^^^^^^^^ +=== Features * *semantic-release:* implement for this formula (https://github.com/saltstack-formulas/apache-formula/commit/34d1f7c[34d1f7c^]) -Tests -^^^^^ +=== Tests * *mod_security_spec:* convert from Serverspec to InSpec (https://github.com/saltstack-formulas/apache-formula/commit/68b971b[68b971b^]) diff --git a/docs/modules/ROOT/pages/README.adoc b/docs/modules/ROOT/pages/README.adoc index 014d2c7f..f952fb62 100644 --- a/docs/modules/ROOT/pages/README.adoc +++ b/docs/modules/ROOT/pages/README.adoc @@ -1,5 +1,4 @@ -apache ------- += apache https://travis-ci.com/saltstack-formulas/apache-formula[image:https://travis-ci.com/saltstack-formulas/apache-formula.svg?branch=master[Travis CI Build Status]] https://github.com/semantic-release/semantic-release[image:https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg[Semantic Release]] @@ -7,8 +6,7 @@ https://github.com/semantic-release/semantic-release[image:https://img.shields.i Formulas to set up and configure the Apache HTTP server on GNU/Linux, FreeBSD, and Windows OS. -General notes -~~~~~~~~~~~~~ +== General notes See the full https://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html[SaltStack @@ -28,8 +26,7 @@ See https://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html#versioning[Formula Versioning Section] for more details. -Contributing to this repo -~~~~~~~~~~~~~~~~~~~~~~~~~ +== Contributing to this repo *Commit message formatting is significant!!* @@ -37,124 +34,100 @@ Please see xref:main::CONTRIBUTING.adoc[How to contribute] for more details. -Available states -~~~~~~~~~~~~~~~~ +== Available states -`apache` -^^^^^^^^ +=== `apache` Installs the Apache package and starts the service. -`apache.config` -^^^^^^^^^^^^^^^ +=== `apache.config` Metastate to apply all apache configuration -`apache.config.file` -^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.file` Configures apache based on os_family -`apache.config.flags` -^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.flags` Configures apache flags on SuSE -`apache.config.certificates` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.certificates` Deploy SSL certificates from pillars -`apache.config.modules` -^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules` Metastate to Enable and disable Apache modules. -`apache.config.modules.mod_mpm` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_mpm` Configures the apache mpm modules on Debian `mpm_prefork`, `mpm_worker` or `mpm_event` (Debian Only) -`apache.config.modules.mod_rewrite` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_rewrite` Enabled the Apache module mod_rewrite (Debian and FreeBSD only) -`apache.config.modules.mod_proxy` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_proxy` Enables the Apache module mod_proxy. (Debian and FreeBSD only) -`apache.config.modules.mod_proxy_http` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_proxy_http` Enables the Apache module mod_proxy_http and requires the Apache module mod_proxy to be enabled. (Debian Only) -`apache.config.modules.mod_proxy_fcgi` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_proxy_fcgi` Enables the Apache module mod_proxy_fcgi and requires the Apache module mod_proxy to be enabled. (Debian Only) -`apache.config.modules.mod_wsgi` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_wsgi` Installs the mod_wsgi package and enables the Apache module. -`apache.config.modules.mod_actions` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_actions` Enables the Apache module mod_actions. (Debian Only) -`apache.config.modules.mod_headers` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_headers` Enables the Apache module mod_headers. (Debian Only) -`apache.config.modules.mod_pagespeed` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_pagespeed` Installs and Enables the mod_pagespeed module. (Debian and RedHat Only) -`apache.config.modules.mod_perl2` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_perl2` Installs and enables the mod_perl2 module (Debian and FreeBSD only) -`apache.config.modules.mod_geoip` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_geoip` Installs and enables the mod_geoIP (RedHat only) -`apache.config.modules.mod_php5` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_php5` Installs and enables the mod_php5 module -`apache.config.modules.mod_cgi` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_cgi` Enables mod_cgi. (FreeBSD only) -`apache.config.modules.mod_fcgid` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_fcgid` Installs and enables the mod_fcgid module (Debian only) -`apache.config.modules.mod_fastcgi` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_fastcgi` Installs and enables the mod_fastcgi module -`apache.config.modules.mod_dav_svn` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_dav_svn` Installs and enables the mod_dav_svn module (Debian only) -`apache.config.modules.mod_security` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_security` Installs an enables the http://modsecurity.org/[Apache mod_security2 WAF] using data from Pillar. (Debian and RedHat Only) @@ -162,58 +135,48 @@ WAF] using data from Pillar. (Debian and RedHat Only) Allows you to install the basic Core Rules (CRS) and some basic configuration for mod_security2 -`apache.config.modules.mod_security.rules` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_security.rules` This state can create symlinks based on basic Core Rules package. (Debian only) Or it can distribute a mod_security rule file and place it /etc/modsecurity/ -`apache.config.modules.mod_socache_shmcb` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_socache_shmcb` Enables mod_socache_shmcb. (FreeBSD only) -`apache.config.modules.mod_ssl` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_ssl` Installs and enables the mod_ssl module (Debian, RedHat and FreeBSD only) -`apache.config.modules.mod_suexec` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_suexec` Enables mod_suexec. (FreeBSD only) -`apache.config.modules.mod_vhost_alias` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_vhost_alias` Enables the Apache module vhost_alias (Debian Only) -`apache.config.modules.mod_remoteip` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_remoteip` Enables and configures the Apache module mod_remoteip using data from Pillar. (Debian Only) -`apache.config.modules.mod_xsendfile` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_xsendfile` Installs and enables mod_xsendfile module. (Debian Only) -`apache.config.own_default_vhost` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.own_default_vhost` Replace default vhost with own version. By default, it's 503 code. (Debian Only) -`apache.config.no_default_vhost` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.no_default_vhost` Remove the default vhost. (Debian Only) -`apache.config.vhosts.standard` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.vhosts.standard` Configures Apache name-based virtual hosts and creates virtual host directories using data from Pillar. @@ -239,45 +202,41 @@ apache: interface: '1.2.3.4 [2001:abc:def:100::3]' ---- -`apache.config.manage_security` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.manage_security` Configures Apache's security.conf options by reassinging them using data from Pillar. -`apache.config.modules.mod_status` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.modules.mod_status` Configures Apache's server_status handler for localhost -`apache.config.debian_full` -^^^^^^^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.debian_full` Installs and configures Apache on Debian and Ubuntu systems. -`apache.config.clean` -^^^^^^^^^^^^^^^^^^^^^ +=== `apache.config.clean` Metastate to cleanup all apache configuration. -`apache.clean` -^^^^^^^^^^^^^^ +=== `apache.clean` Stops the Apache service and uninstalls the package. These states are ordered using the `order` declaration. Different stages are divided into the following number ranges: -1. apache will use 1-500 for ordering -2. apache will reserve 1 -100 as unused -3. apache will reserve 101-150 for pre pkg install -4. apache will reserve 151-200 for pkg install -5. apache will reserve 201-250 for pkg configure -6. apache will reserve 251-300 for downloads, git stuff, load data -7. apache will reserve 301-400 for unknown purposes -8. apache will reserve 401-450 for service restart-reloads -9. apache WILL reserve 451-460 for service.running -10. apache will reserve 461-500 for cmd requiring operational services +[arabic] +. apache will use 1-500 for ordering +. apache will reserve 1 -100 as unused +. apache will reserve 101-150 for pre pkg install +. apache will reserve 151-200 for pkg install +. apache will reserve 201-250 for pkg configure +. apache will reserve 251-300 for downloads, git stuff, load data +. apache will reserve 301-400 for unknown purposes +. apache will reserve 401-450 for service restart-reloads +. apache WILL reserve 451-460 for service.running +. apache will reserve 461-500 for cmd requiring operational services Example Pillar: @@ -307,13 +266,11 @@ apache: SSLCertificateChainFile: /path/to/ssl.ca.crt ---- -Testing -~~~~~~~ +== Testing Linux testing is done with `kitchen-salt`. -Requirements -^^^^^^^^^^^^ +=== Requirements * Ruby * Docker @@ -328,47 +285,39 @@ $ bin/kitchen test [platform] Where `[platform]` is the platform name defined in `kitchen.yml`, e.g. `debian-9-2019-2-py3`. -`bin/kitchen converge` -^^^^^^^^^^^^^^^^^^^^^^ +=== `bin/kitchen converge` Creates the docker instance and runs the `apache` main states, ready for testing. -`bin/kitchen verify` -^^^^^^^^^^^^^^^^^^^^ +=== `bin/kitchen verify` Runs the `inspec` tests on the actual instance. -`bin/kitchen destroy` -^^^^^^^^^^^^^^^^^^^^^ +=== `bin/kitchen destroy` Removes the docker instance. -`bin/kitchen test` -^^^^^^^^^^^^^^^^^^ +=== `bin/kitchen test` Runs all of the stages above in one go: i.e. `destroy` + `converge` + `verify` + `destroy`. -`bin/kitchen login` -^^^^^^^^^^^^^^^^^^^ +=== `bin/kitchen login` Gives you SSH access to the instance for manual testing. -Testing with Vagrant -~~~~~~~~~~~~~~~~~~~~ +== Testing with Vagrant Windows/FreeBSD/OpenBSD testing is done with `kitchen-salt`. -Requirements -^^^^^^^^^^^^ +=== Requirements * Ruby * Virtualbox * Vagrant -Setup -^^^^^ +=== Setup [source,bash] ---- @@ -380,8 +329,7 @@ $ bin/kitchen test [platform] Where `[platform]` is the platform name defined in `kitchen.vagrant.yml`, e.g. `windows-81-latest-py3`. -Note -^^^^ +=== Note When testing using Vagrant you must set the environment variable `KITCHEN_LOCAL_YAML` to `kitchen.vagrant.yml`. For example: @@ -395,29 +343,24 @@ $ bin/kitchen test Then run the following commands as needed. -`bin/kitchen converge` -^^^^^^^^^^^^^^^^^^^^^^ +=== `bin/kitchen converge` Creates the Vagrant instance and runs the `apache` main states, ready for testing. -`bin/kitchen verify` -^^^^^^^^^^^^^^^^^^^^ +=== `bin/kitchen verify` Runs the `inspec` tests on the actual instance. -`bin/kitchen destroy` -^^^^^^^^^^^^^^^^^^^^^ +=== `bin/kitchen destroy` Removes the Vagrant instance. -`bin/kitchen test` -^^^^^^^^^^^^^^^^^^ +=== `bin/kitchen test` Runs all of the stages above in one go: i.e. `destroy` + `converge` + `verify` + `destroy`. -`bin/kitchen login` -^^^^^^^^^^^^^^^^^^^ +=== `bin/kitchen login` Gives you RDP/SSH access to the instance for manual testing.