ExternalMirrors
/
apache-formula
зеркало из https://github.com/saltstack-formulas/apache-formula.git
Следить 1
В избранное 0
Форкнуть 1
Код Задачи 0 Релизы 31 Вики Активность
Просмотр исходного кода

chore(release): 2.0.1 [skip ci] 

## [2.0.1](https://github.com/saltstack-formulas/apache-formula/compare/v2.0.0...v2.0.1) (2021-05-08)

### Continuous Integration

* **antora:** convert `.rst` files to `.adoc` during `semantic-release` ([9cf428a](9cf428ab49))
* **gitlab-ci:** make adjustments to test Antora more efficiently ([12c0a0f](12c0a0f1b2))

### Documentation

* **readme:** remove unused Sphinx `readme` anchor ([155cd69](155cd69d6b))
tags/v1.1.4
semantic-release-bot 3 лет назад
Родитель
155cd69d6b
Сommit
36530d71cd
9 измененных файлов: 380 добавлений и 328 удалений
Разделённый вид Показать статистику Diff
  1. +6
    -19
      AUTHORS.md
  2. +13
    -0
      CHANGELOG.md
  3. +1
    -1
      FORMULA
  4. +12
    -51
      docs/AUTHORS.rst
  5. +16
    -0
      docs/CHANGELOG.rst
  6. +1
    -1
      docs/antora.yml
  7. +31
    -120
      docs/modules/ROOT/pages/AUTHORS.adoc
  8. +174
    -67
      docs/modules/ROOT/pages/CHANGELOG.adoc
  9. +126
    -69
      docs/modules/ROOT/pages/README.adoc

+ 6
- 19
AUTHORS.md Просмотреть файл

@@ -4,17 +4,14 @@ This list is sorted by the number of commits per contributor in _descending_ ord

Avatar|Contributor|Contributions
:-:|---|:-:
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|89
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|40
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|39
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|36
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|32
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>|[@whiteinge](https://github.com/whiteinge)|31
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|29
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|27
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|30
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|23
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|20
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|20
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/214768?v=4' width='36' height='36' alt='@ixs'>|[@ixs](https://github.com/ixs)|10
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/458548?v=4' width='36' height='36' alt='@SuperTux88'>|[@SuperTux88](https://github.com/SuperTux88)|10
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|11
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/287147?v=4' width='36' height='36' alt='@techhat'>|[@techhat](https://github.com/techhat)|10
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/904839?v=4' width='36' height='36' alt='@landergate'>|[@landergate](https://github.com/landergate)|9
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3045456?v=4' width='36' height='36' alt='@bradthurber'>|[@bradthurber](https://github.com/bradthurber)|8
@@ -24,16 +21,15 @@ Avatar|Contributor|Contributions
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/17673243?v=4' width='36' height='36' alt='@porunov'>|[@porunov](https://github.com/porunov)|7
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3119969?v=4' width='36' height='36' alt='@genuss'>|[@genuss](https://github.com/genuss)|6
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5759396?v=4' width='36' height='36' alt='@kadogo'>|[@kadogo](https://github.com/kadogo)|6
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/214768?v=4' width='36' height='36' alt='@ixs'>|[@ixs](https://github.com/ixs)|5
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/637990?v=4' width='36' height='36' alt='@bmwiedemann'>|[@bmwiedemann](https://github.com/bmwiedemann)|5
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/48491?v=4' width='36' height='36' alt='@eliasp'>|[@eliasp](https://github.com/eliasp)|5
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/65311?v=4' width='36' height='36' alt='@multani'>|[@multani](https://github.com/multani)|5
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1013915?v=4' width='36' height='36' alt='@rhertzog'>|[@rhertzog](https://github.com/rhertzog)|4
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/20515?v=4' width='36' height='36' alt='@scambra'>|[@scambra](https://github.com/scambra)|4
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2094680?v=4' width='36' height='36' alt='@daschatten'>|[@daschatten](https://github.com/daschatten)|4
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1744181?v=4' width='36' height='36' alt='@adherzog'>|[@adherzog](https://github.com/adherzog)|3
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2192630?v=4' width='36' height='36' alt='@abrefort'>|[@abrefort](https://github.com/abrefort)|3
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1507504?v=4' width='36' height='36' alt='@arnisoph'>|[@arnisoph](https://github.com/arnisoph)|3
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>|[@dafyddj](https://github.com/dafyddj)|3
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/312493?v=4' width='36' height='36' alt='@opdude'>|[@opdude](https://github.com/opdude)|3
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10925856?v=4' width='36' height='36' alt='@louis-haddrell'>|[@louis-haddrell](https://github.com/louis-haddrell)|3
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/964610?v=4' width='36' height='36' alt='@Wenzel'>|[@Wenzel](https://github.com/Wenzel)|3
@@ -43,7 +39,6 @@ Avatar|Contributor|Contributions
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1079875?v=4' width='36' height='36' alt='@bogdanr'>|[@bogdanr](https://github.com/bogdanr)|2
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/11229682?v=4' width='36' height='36' alt='@carlovollebregt'>|[@carlovollebregt](https://github.com/carlovollebregt)|2
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4313010?v=4' width='36' height='36' alt='@thornycrackers'>|[@thornycrackers](https://github.com/thornycrackers)|2
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/29622411?v=4' width='36' height='36' alt='@gaetanars'>|[@gaetanars](https://github.com/gaetanars)|2
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/7060082?v=4' width='36' height='36' alt='@msciciel'>|[@msciciel](https://github.com/msciciel)|2
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/485400?v=4' width='36' height='36' alt='@actionjack'>|[@actionjack](https://github.com/actionjack)|2
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/316108?v=4' width='36' height='36' alt='@mosen'>|[@mosen](https://github.com/mosen)|2
@@ -57,21 +52,16 @@ Avatar|Contributor|Contributions
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/7612102?v=4' width='36' height='36' alt='@isntall'>|[@isntall](https://github.com/isntall)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/863137?v=4' width='36' height='36' alt='@benjy'>|[@benjy](https://github.com/benjy)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>|[@iggy](https://github.com/iggy)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/47893434?v=4' width='36' height='36' alt='@chorne-togetherwork'>|[@chorne-togetherwork](https://github.com/chorne-togetherwork)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/130219?v=4' width='36' height='36' alt='@corywright'>|[@corywright](https://github.com/corywright)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1233212?v=4' width='36' height='36' alt='@baby-gnu'>|[@baby-gnu](https://github.com/baby-gnu)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1640672?v=4' width='36' height='36' alt='@ev0rtex'>|[@ev0rtex](https://github.com/ev0rtex)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/42472863?v=4' width='36' height='36' alt='@dimitry-unified-streaming'>|[@dimitry-unified-streaming](https://github.com/dimitry-unified-streaming)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1194646?v=4' width='36' height='36' alt='@fintanmm'>|[@fintanmm](https://github.com/fintanmm)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/215487?v=4' width='36' height='36' alt='@fcrozat'>|[@fcrozat](https://github.com/fcrozat)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/38090329?v=4' width='36' height='36' alt='@genaumann'>|[@genaumann](https://github.com/genaumann)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/41886?v=4' width='36' height='36' alt='@jbouse'>|[@jbouse](https://github.com/jbouse)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/377632?v=4' width='36' height='36' alt='@jerrykan'>|[@jerrykan](https://github.com/jerrykan)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3703806?v=4' width='36' height='36' alt='@jcristau'>|[@jcristau](https://github.com/jcristau)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5655231?v=4' width='36' height='36' alt='@kpostrup'>|[@kpostrup](https://github.com/kpostrup)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/783794?v=4' width='36' height='36' alt='@morsik'>|[@morsik](https://github.com/morsik)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/22311?v=4' width='36' height='36' alt='@madssj'>|[@madssj](https://github.com/madssj)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/201711?v=4' width='36' height='36' alt='@mariusvw'>|[@mariusvw](https://github.com/mariusvw)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1106959?v=4' width='36' height='36' alt='@mpeeters'>|[@mpeeters](https://github.com/mpeeters)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/7139195?v=4' width='36' height='36' alt='@xenophonf'>|[@xenophonf](https://github.com/xenophonf)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/393545?v=4' width='36' height='36' alt='@mshade'>|[@mshade](https://github.com/mshade)|1
@@ -82,17 +72,14 @@ Avatar|Contributor|Contributions
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3667731?v=4' width='36' height='36' alt='@netzvieh'>|[@netzvieh](https://github.com/netzvieh)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4156131?v=4' width='36' height='36' alt='@skylerberg'>|[@skylerberg](https://github.com/skylerberg)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/326786?v=4' width='36' height='36' alt='@wido'>|[@wido](https://github.com/wido)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/751889?v=4' width='36' height='36' alt='@Yoda-BZH'>|[@Yoda-BZH](https://github.com/Yoda-BZH)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/9978732?v=4' width='36' height='36' alt='@abehling'>|[@abehling](https://github.com/abehling)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1021809?v=4' width='36' height='36' alt='@ardin'>|[@ardin](https://github.com/ardin)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/17029228?v=4' width='36' height='36' alt='@mcarlton00'>|[@mcarlton00](https://github.com/mcarlton00)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/924183?v=4' width='36' height='36' alt='@mschiff'>|[@mschiff](https://github.com/mschiff)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2869?v=4' width='36' height='36' alt='@nigelsim'>|[@nigelsim](https://github.com/nigelsim)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/55587680?v=4' width='36' height='36' alt='@srse'>|[@srse](https://github.com/srse)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/46799934?v=4' width='36' height='36' alt='@sticky-note'>|[@sticky-note](https://github.com/sticky-note)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/18380701?v=4' width='36' height='36' alt='@tsenay'>|[@tsenay](https://github.com/tsenay)|1
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2089076?v=4' width='36' height='36' alt='@ze42'>|[@ze42](https://github.com/ze42)|1

---

Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-04-30.
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-05-08.

+ 13
- 0
CHANGELOG.md Просмотреть файл

@@ -1,5 +1,18 @@
# Changelog

## [2.0.1](https://github.com/saltstack-formulas/apache-formula/compare/v2.0.0...v2.0.1) (2021-05-08)


### Continuous Integration

* **antora:** convert `.rst` files to `.adoc` during `semantic-release` ([9cf428a](https://github.com/saltstack-formulas/apache-formula/commit/9cf428ab493bd4ee6cc93147487cbe8cd02e6513))
* **gitlab-ci:** make adjustments to test Antora more efficiently ([12c0a0f](https://github.com/saltstack-formulas/apache-formula/commit/12c0a0f1b209b6666f5b0919a16149e46471b34c))


### Documentation

* **readme:** remove unused Sphinx `readme` anchor ([155cd69](https://github.com/saltstack-formulas/apache-formula/commit/155cd69d6b29a13c6d3d47c846242eb9961fa007))

## [1.1.3](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.2...v1.1.3) (2021-04-30)



+ 1
- 1
FORMULA Просмотреть файл

@@ -1,7 +1,7 @@
name: apache
os: RedHat, Fedora, CentOS, Debian, Ubuntu, Suse, FreeBSD
os_family: RedHat, Debian, Suse, FreeBSD
version: 1.1.3
version: 2.0.1
release: 1
minimum_version: 2015.8
summary: Formula for installing Apache

+ 12
- 51
docs/AUTHORS.rst Просмотреть файл

@@ -13,39 +13,30 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - Avatar
- Contributor
- Contributions
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
- `@myii <https://github.com/myii>`_
- 89
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>`
- `@alxwr <https://github.com/alxwr>`_
- 40
- 39
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>`
- `@gravyboat <https://github.com/gravyboat>`_
- 36
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
- `@aboe76 <https://github.com/aboe76>`_
- 32
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>`
- `@whiteinge <https://github.com/whiteinge>`_
- 31
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
- `@noelmcloughlin <https://github.com/noelmcloughlin>`_
- 29
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
- `@aboe76 <https://github.com/aboe76>`_
- 30
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
- `@javierbertoli <https://github.com/javierbertoli>`_
- 27
- 23
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>`
- `@nmadhok <https://github.com/nmadhok>`_
- 20
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>`
- `@puneetk <https://github.com/puneetk>`_
- 20
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/214768?v=4' width='36' height='36' alt='@ixs'>`
- `@ixs <https://github.com/ixs>`_
- 10
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/458548?v=4' width='36' height='36' alt='@SuperTux88'>`
- `@SuperTux88 <https://github.com/SuperTux88>`_
- 10
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
- `@noelmcloughlin <https://github.com/noelmcloughlin>`_
- 11
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/287147?v=4' width='36' height='36' alt='@techhat'>`
- `@techhat <https://github.com/techhat>`_
- 10
@@ -73,6 +64,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5759396?v=4' width='36' height='36' alt='@kadogo'>`
- `@kadogo <https://github.com/kadogo>`_
- 6
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/214768?v=4' width='36' height='36' alt='@ixs'>`
- `@ixs <https://github.com/ixs>`_
- 5
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/637990?v=4' width='36' height='36' alt='@bmwiedemann'>`
- `@bmwiedemann <https://github.com/bmwiedemann>`_
- 5
@@ -85,9 +79,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1013915?v=4' width='36' height='36' alt='@rhertzog'>`
- `@rhertzog <https://github.com/rhertzog>`_
- 4
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/20515?v=4' width='36' height='36' alt='@scambra'>`
- `@scambra <https://github.com/scambra>`_
- 4
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2094680?v=4' width='36' height='36' alt='@daschatten'>`
- `@daschatten <https://github.com/daschatten>`_
- 4
@@ -100,9 +91,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1507504?v=4' width='36' height='36' alt='@arnisoph'>`
- `@arnisoph <https://github.com/arnisoph>`_
- 3
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>`
- `@dafyddj <https://github.com/dafyddj>`_
- 3
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/312493?v=4' width='36' height='36' alt='@opdude'>`
- `@opdude <https://github.com/opdude>`_
- 3
@@ -130,9 +118,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4313010?v=4' width='36' height='36' alt='@thornycrackers'>`
- `@thornycrackers <https://github.com/thornycrackers>`_
- 2
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/29622411?v=4' width='36' height='36' alt='@gaetanars'>`
- `@gaetanars <https://github.com/gaetanars>`_
- 2
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/7060082?v=4' width='36' height='36' alt='@msciciel'>`
- `@msciciel <https://github.com/msciciel>`_
- 2
@@ -172,30 +157,18 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>`
- `@iggy <https://github.com/iggy>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/47893434?v=4' width='36' height='36' alt='@chorne-togetherwork'>`
- `@chorne-togetherwork <https://github.com/chorne-togetherwork>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/130219?v=4' width='36' height='36' alt='@corywright'>`
- `@corywright <https://github.com/corywright>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1233212?v=4' width='36' height='36' alt='@baby-gnu'>`
- `@baby-gnu <https://github.com/baby-gnu>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1640672?v=4' width='36' height='36' alt='@ev0rtex'>`
- `@ev0rtex <https://github.com/ev0rtex>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/42472863?v=4' width='36' height='36' alt='@dimitry-unified-streaming'>`
- `@dimitry-unified-streaming <https://github.com/dimitry-unified-streaming>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1194646?v=4' width='36' height='36' alt='@fintanmm'>`
- `@fintanmm <https://github.com/fintanmm>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/215487?v=4' width='36' height='36' alt='@fcrozat'>`
- `@fcrozat <https://github.com/fcrozat>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/38090329?v=4' width='36' height='36' alt='@genaumann'>`
- `@genaumann <https://github.com/genaumann>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/41886?v=4' width='36' height='36' alt='@jbouse'>`
- `@jbouse <https://github.com/jbouse>`_
- 1
@@ -214,9 +187,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/22311?v=4' width='36' height='36' alt='@madssj'>`
- `@madssj <https://github.com/madssj>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/201711?v=4' width='36' height='36' alt='@mariusvw'>`
- `@mariusvw <https://github.com/mariusvw>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1106959?v=4' width='36' height='36' alt='@mpeeters'>`
- `@mpeeters <https://github.com/mpeeters>`_
- 1
@@ -247,18 +217,12 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/326786?v=4' width='36' height='36' alt='@wido'>`
- `@wido <https://github.com/wido>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/751889?v=4' width='36' height='36' alt='@Yoda-BZH'>`
- `@Yoda-BZH <https://github.com/Yoda-BZH>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/9978732?v=4' width='36' height='36' alt='@abehling'>`
- `@abehling <https://github.com/abehling>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1021809?v=4' width='36' height='36' alt='@ardin'>`
- `@ardin <https://github.com/ardin>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/17029228?v=4' width='36' height='36' alt='@mcarlton00'>`
- `@mcarlton00 <https://github.com/mcarlton00>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/924183?v=4' width='36' height='36' alt='@mschiff'>`
- `@mschiff <https://github.com/mschiff>`_
- 1
@@ -268,9 +232,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/55587680?v=4' width='36' height='36' alt='@srse'>`
- `@srse <https://github.com/srse>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/46799934?v=4' width='36' height='36' alt='@sticky-note'>`
- `@sticky-note <https://github.com/sticky-note>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/18380701?v=4' width='36' height='36' alt='@tsenay'>`
- `@tsenay <https://github.com/tsenay>`_
- 1
@@ -281,4 +242,4 @@ This list is sorted by the number of commits per contributor in *descending* ord

----

Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-04-30.
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-05-08.

+ 16
- 0
docs/CHANGELOG.rst Просмотреть файл

@@ -2,6 +2,22 @@
Changelog
=========

`2.0.1 <https://github.com/saltstack-formulas/apache-formula/compare/v2.0.0...v2.0.1>`_ (2021-05-08)
--------------------------------------------------------------------------------------------------------

Continuous Integration
^^^^^^^^^^^^^^^^^^^^^^


* **antora:** convert ``.rst`` files to ``.adoc`` during ``semantic-release`` (\ `9cf428a <https://github.com/saltstack-formulas/apache-formula/commit/9cf428ab493bd4ee6cc93147487cbe8cd02e6513>`_\ )
* **gitlab-ci:** make adjustments to test Antora more efficiently (\ `12c0a0f <https://github.com/saltstack-formulas/apache-formula/commit/12c0a0f1b209b6666f5b0919a16149e46471b34c>`_\ )

Documentation
^^^^^^^^^^^^^


* **readme:** remove unused Sphinx ``readme`` anchor (\ `155cd69 <https://github.com/saltstack-formulas/apache-formula/commit/155cd69d6b29a13c6d3d47c846242eb9961fa007>`_\ )

`1.1.3 <https://github.com/saltstack-formulas/apache-formula/compare/v1.1.2...v1.1.3>`_ (2021-04-30)
--------------------------------------------------------------------------------------------------------


+ 1
- 1
docs/antora.yml Просмотреть файл

@@ -1,7 +1,7 @@
---
name: 'apache-formula'
title: 'apache-formula'
version: '1.1.3'
version: '2.0.1'
start_page: 'README.adoc'
nav:
- 'modules/ROOT/nav-repo-docs.adoc'

+ 31
- 120
docs/modules/ROOT/pages/AUTHORS.adoc Просмотреть файл

@@ -1,4 +1,5 @@
= Authors
Authors
-------

This list is sorted by the number of commits per contributor in
_descending_ order.
@@ -10,34 +11,23 @@ _descending_ order.
<.^|Contributor
^.^|Contributions

|image::https://avatars.githubusercontent.com/u/10231489?v=4[@myii,36,36]
|https://github.com/myii[@myii^]
|89

|image::https://avatars.githubusercontent.com/u/1920805?v=4[@alxwr,36,36]
|https://github.com/alxwr[@alxwr^]
|40

|39
|image::https://avatars.githubusercontent.com/u/1396878?v=4[@gravyboat,36,36]
|https://github.com/gravyboat[@gravyboat^]
|36

|image::https://avatars.githubusercontent.com/u/1800660?v=4[@aboe76,36,36]
|https://github.com/aboe76[@aboe76^]
|32
|36

|image::https://avatars.githubusercontent.com/u/91293?v=4[@whiteinge,36,36]
|https://github.com/whiteinge[@whiteinge^]
|31

|image::https://avatars.githubusercontent.com/u/13322818?v=4[@noelmcloughlin,36,36]
|https://github.com/noelmcloughlin[@noelmcloughlin^]
|29
|31
|image::https://avatars.githubusercontent.com/u/1800660?v=4[@aboe76,36,36]
|https://github.com/aboe76[@aboe76^]
|30

|image::https://avatars.githubusercontent.com/u/242396?v=4[@javierbertoli,36,36]
|https://github.com/javierbertoli[@javierbertoli^]
|27

|23
|image::https://avatars.githubusercontent.com/u/3374962?v=4[@nmadhok,36,36]
|https://github.com/nmadhok[@nmadhok^]
|20
@@ -45,35 +35,27 @@ _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
|image::https://avatars.githubusercontent.com/u/13322818?v=4[@noelmcloughlin,36,36]
|https://github.com/noelmcloughlin[@noelmcloughlin^]
|11

|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
@@ -81,7 +63,6 @@ _descending_ order.
|image::https://avatars.githubusercontent.com/u/17673243?v=4[@porunov,36,36]
|https://github.com/porunov[@porunov^]
|7

|image::https://avatars.githubusercontent.com/u/3119969?v=4[@genuss,36,36]
|https://github.com/genuss[@genuss^]
|6
@@ -89,11 +70,13 @@ _descending_ order.
|image::https://avatars.githubusercontent.com/u/5759396?v=4[@kadogo,36,36]
|https://github.com/kadogo[@kadogo^]
|6
|image::https://avatars.githubusercontent.com/u/214768?v=4[@ixs,36,36]
|https://github.com/ixs[@ixs^]
|5

|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
@@ -101,19 +84,13 @@ _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

|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
@@ -121,63 +98,48 @@ _descending_ order.
|image::https://avatars.githubusercontent.com/u/2192630?v=4[@abrefort,36,36]
|https://github.com/abrefort[@abrefort^]
|3

|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

|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

|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
@@ -185,7 +147,6 @@ _descending_ order.
|image::https://avatars.githubusercontent.com/u/1244954?v=4[@RyPeck,36,36]
|https://github.com/RyPeck[@RyPeck^]
|2

|image::https://avatars.githubusercontent.com/u/507599?v=4[@thatch45,36,36]
|https://github.com/thatch45[@thatch45^]
|2
@@ -193,7 +154,6 @@ _descending_ order.
|image::https://avatars.githubusercontent.com/u/19413421?v=4[@tibberg,36,36]
|https://github.com/tibberg[@tibberg^]
|2

|image::https://avatars.githubusercontent.com/u/15383526?v=4[@emeygret,36,36]
|https://github.com/emeygret[@emeygret^]
|2
@@ -201,15 +161,13 @@ _descending_ order.
|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

|image::https://avatars.githubusercontent.com/u/7612102?v=4[@isntall,36,36]
|https://github.com/isntall[@isntall^]
|1
@@ -217,48 +175,27 @@ _descending_ order.
|image::https://avatars.githubusercontent.com/u/863137?v=4[@benjy,36,36]
|https://github.com/benjy[@benjy^]
|1

|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

|image::https://avatars.githubusercontent.com/u/130219?v=4[@corywright,36,36]
|https://github.com/corywright[@corywright^]
|1

|image::https://avatars.githubusercontent.com/u/1233212?v=4[@baby-gnu,36,36]
|https://github.com/baby-gnu[@baby-gnu^]
|1

|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

|image::https://avatars.githubusercontent.com/u/41886?v=4[@jbouse,36,36]
|https://github.com/jbouse[@jbouse^]
|1

|image::https://avatars.githubusercontent.com/u/377632?v=4[@jerrykan,36,36]
|https://github.com/jerrykan[@jerrykan^]
|1
@@ -266,7 +203,6 @@ _descending_ order.
|image::https://avatars.githubusercontent.com/u/3703806?v=4[@jcristau,36,36]
|https://github.com/jcristau[@jcristau^]
|1

|image::https://avatars.githubusercontent.com/u/5655231?v=4[@kpostrup,36,36]
|https://github.com/kpostrup[@kpostrup^]
|1
@@ -274,27 +210,20 @@ _descending_ order.
|image::https://avatars.githubusercontent.com/u/783794?v=4[@morsik,36,36]
|https://github.com/morsik[@morsik^]
|1

|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

|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
@@ -302,7 +231,6 @@ _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
@@ -310,39 +238,27 @@ _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

|1
|image::https://avatars.githubusercontent.com/u/326786?v=4[@wido,36,36]
|https://github.com/wido[@wido^]
|1

|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

|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

|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
@@ -350,11 +266,6 @@ _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

|image::https://avatars.githubusercontent.com/u/18380701?v=4[@tsenay,36,36]
|https://github.com/tsenay[@tsenay^]
|1
@@ -368,4 +279,4 @@ _descending_ order.

Auto-generated by a https://github.com/myii/maintainer[forked version^]
of https://github.com/gaocegege/maintainer[gaocegege/maintainer^] on
2021-04-30.
2021-05-08.

+ 174
- 67
docs/modules/ROOT/pages/CHANGELOG.adoc Просмотреть файл

@@ -1,17 +1,40 @@
= Changelog
Changelog

:sectnums!:
---------

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.2...v1.1.3++[1.1.3^] (2021-04-30)
https://github.com/saltstack-formulas/apache-formula/compare/v2.0.0...v2.0.1[2.0.1^]
(2021-05-08)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

=== Bug Fixes
Continuous Integration
^^^^^^^^^^^^^^^^^^^^^^

* *antora:* convert `.rst` files to `.adoc` during `semantic-release`
(https://github.com/saltstack-formulas/apache-formula/commit/9cf428ab493bd4ee6cc93147487cbe8cd02e6513[9cf428a^])
* *gitlab-ci:* make adjustments to test Antora more efficiently
(https://github.com/saltstack-formulas/apache-formula/commit/12c0a0f1b209b6666f5b0919a16149e46471b34c[12c0a0f^])

Documentation
^^^^^^^^^^^^^

* *readme:* remove unused Sphinx `readme` anchor
(https://github.com/saltstack-formulas/apache-formula/commit/155cd69d6b29a13c6d3d47c846242eb9961fa007[155cd69^])

https://github.com/saltstack-formulas/apache-formula/compare/v1.1.2...v1.1.3[1.1.3^]
(2021-04-30)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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^])
@@ -20,16 +43,20 @@ https://github.com/saltstack-formulas/apache-formula/issues/302[#302^]
* *vagrant:* use pre-salted boxes & conditional local settings [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/f354ace8e7d328580a60dbc09703ddc54a6af0a0[f354ace^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.1...v1.1.2++[1.1.2^] (2021-04-03)
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^])
@@ -44,26 +71,32 @@ https://github.com/saltstack-formulas/apache-formula/issues/302[#302^]
* *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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.0...v1.1.1++[1.1.1^] (2021-01-04)
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^])
@@ -72,45 +105,58 @@ https://github.com/saltstack-formulas/apache-formula/issues/302[#302^]
* *gitlab-ci:* use GitLab CI as Travis CI replacement
(https://github.com/saltstack-formulas/apache-formula/commit/26208c47c644608b00adfa8474616305e7a55e36[26208c4^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.0.5...v1.1.0++[1.1.0^] (2020-10-14)
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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.0.4...v1.0.5++[1.0.5^] (2020-10-14)
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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.0.3...v1.0.4++[1.0.4^] (2020-10-14)
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^])
@@ -121,35 +167,46 @@ https://github.com/saltstack-formulas/apache-formula/issues/302[#302^]
* *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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.0.2...v1.0.3++[1.0.3^] (2020-10-13)
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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.0.1...v1.0.2++[1.0.2^] (2020-10-12)
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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.0.0...v1.0.1++[1.0.1^] (2020-10-10)
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^]
@@ -159,21 +216,26 @@ 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^]

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.41.1...v1.0.0++[1.0.0^] (2020-10-05)
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"
@@ -191,44 +253,58 @@ https://github.com//travis-ci.org/github/myii/apache-formula/builds/731605038/is
NOT-BREAKING CHANGE: 'config.sls' became 'config/init.sls' NOT-BREAKING
CHANGE: 'uninstall.sls' symlinked to 'clean.sls'

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.41.0...v0.41.1++[0.41.1^] (2020-07-20)
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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.40.0...v0.41.0++[0.41.0^] (2020-07-16)
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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.39.5...v0.40.0++[0.40.0^] (2020-07-16)
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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.39.4...v0.39.5++[0.39.5^] (2020-06-21)
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^])
@@ -241,44 +317,60 @@ https://github.com/saltstack-formulas/apache-formula/issues/278[#278^]
* *workflows/commitlint:* add to repo [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/2ce966d031e9044e8794dc93f605ce780fd99f12[2ce966d^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.39.3...v0.39.4++[0.39.4^] (2020-04-02)
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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.39.2...v0.39.3++[0.39.3^] (2020-04-02)
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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.39.1...v0.39.2++[0.39.2^] (2019-12-20)
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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.39.0...v0.39.1++[0.39.1^] (2019-12-20)
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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.38.2...v0.39.0++[0.39.0^] (2019-12-20)
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^])
@@ -293,28 +385,36 @@ https://github.com/saltstack-formulas/apache-formula/issues/278[#278^]
* *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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.38.1...v0.38.2++[0.38.2^] (2019-11-07)
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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.38.0...v0.38.1++[0.38.1^] (2019-11-05)
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^])
@@ -326,14 +426,18 @@ https://github.com/saltstack-formulas/apache-formula/issues/278[#278^]
* *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^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.37.4...v0.38.0++[0.38.0^] (2019-10-20)
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^])
@@ -368,19 +472,22 @@ https://github.com/saltstack-formulas/apache-formula/issues/278[#278^]
* *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^])

+ 126
- 69
docs/modules/ROOT/pages/README.adoc Просмотреть файл

@@ -1,4 +1,5 @@
= 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]]
@@ -6,7 +7,8 @@ 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
@@ -26,7 +28,8 @@ 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!!*

@@ -34,100 +37,124 @@ 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)
@@ -135,48 +162,58 @@ 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.
@@ -202,41 +239,45 @@ 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:

[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
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

Example Pillar:

@@ -266,11 +307,13 @@ apache:
SSLCertificateChainFile: /path/to/ssl.ca.crt
----

== Testing
Testing
~~~~~~~

Linux testing is done with `kitchen-salt`.

=== Requirements
Requirements
^^^^^^^^^^^^

* Ruby
* Docker
@@ -285,39 +328,47 @@ $ 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]
----
@@ -329,7 +380,8 @@ $ 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:
@@ -343,24 +395,29 @@ $ 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.

Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить