ExternalMirrors
/
apache-formula
镜像来自 https://github.com/saltstack-formulas/apache-formula.git
關注 1
收藏 0
複製 1
程式碼 問題 0 版本發佈 31 Wiki 活動
瀏覽代碼

chore(release): 1.2.1 [skip ci] 

## [1.2.1](https://github.com/saltstack-formulas/apache-formula/compare/v1.2.0...v1.2.1) (2021-10-20)

### Bug Fixes

* **vhosts:** reset `cleanup` to previous and use dedicated `clean` SLS ([0c6c1d3](0c6c1d36e2))

### Continuous Integration

* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([a3d49f1](a3d49f1852))
* test for upstream Salt regressions in `master` instances (2021-W37a) ([69dcfd9](69dcfd9c3b))

### Documentation

* **readme:** document vhosts clean/cleanup ([2d72dff](2d72dff82b)), closes [#372](https://github.com/saltstack-formulas/apache-formula/issues/372)
tags/v1.2.1
semantic-release-bot 3 年之前
父節點
cde7c5b6db
當前提交
86dc3b3d6f
共有 9 個檔案被更改，包括 222 行新增 和 146 行删除
分割檢視 顯示文件統計
  1. +3
    -3
      AUTHORS.md
  2. +18
    -0
      CHANGELOG.md
  3. +1
    -1
      FORMULA
  4. +5
    -5
      docs/AUTHORS.rst
  5. +22
    -0
      docs/CHANGELOG.rst
  6. +1
    -1
      docs/antora.yml
  7. +6
    -6
      docs/modules/ROOT/pages/AUTHORS.adoc
  8. +88
    -60
      docs/modules/ROOT/pages/CHANGELOG.adoc
  9. +78
    -70
      docs/modules/ROOT/pages/README.adoc

+ 3
- 3
AUTHORS.md 查看文件

@@ -4,7 +4,7 @@ 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)|124
<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)|145
<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/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
@@ -40,6 +40,7 @@ Avatar|Contributor|Contributions
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/228723?v=4' width='36' height='36' alt='@abednarik'>|[@abednarik](https://github.com/abednarik)|3
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/12513495?v=4' width='36' height='36' alt='@dexbleeker'>|[@dexbleeker](https://github.com/dexbleeker)|3
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/112249?v=4' width='36' height='36' alt='@vincentfretin'>|[@vincentfretin](https://github.com/vincentfretin)|3
<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)|3
<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
@@ -84,7 +85,6 @@ Avatar|Contributor|Contributions
<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/7967223?v=4' width='36' height='36' alt='@TiepiNL'>|[@TiepiNL](https://github.com/TiepiNL)|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
@@ -97,4 +97,4 @@ Avatar|Contributor|Contributions

---

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

+ 18
- 0
CHANGELOG.md 查看文件

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

## [1.2.1](https://github.com/saltstack-formulas/apache-formula/compare/v1.2.0...v1.2.1) (2021-10-20)


### Bug Fixes

* **vhosts:** reset `cleanup` to previous and use dedicated `clean` SLS ([0c6c1d3](https://github.com/saltstack-formulas/apache-formula/commit/0c6c1d36e261ae6f851cb9b6ed2d1319af460a73))


### Continuous Integration

* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([a3d49f1](https://github.com/saltstack-formulas/apache-formula/commit/a3d49f185274efc6d1530580daf03b1ad2be0e2d))
* test for upstream Salt regressions in `master` instances (2021-W37a) ([69dcfd9](https://github.com/saltstack-formulas/apache-formula/commit/69dcfd9c3bf49416e6c77d8e982446d99af3b95c))


### Documentation

* **readme:** document vhosts clean/cleanup ([2d72dff](https://github.com/saltstack-formulas/apache-formula/commit/2d72dff82bdcf9c0d30f6735c315a655ebea483d)), closes [#372](https://github.com/saltstack-formulas/apache-formula/issues/372)

# [1.2.0](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.8...v1.2.0) (2021-08-28)



+ 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.2.0
version: 1.2.1
release: 1
minimum_version: 2015.8
summary: Formula for installing Apache

+ 5
- 5
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:`<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>`_
- 124
- 145
* - :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
@@ -121,6 +121,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/112249?v=4' width='36' height='36' alt='@vincentfretin'>`
- `@vincentfretin <https://github.com/vincentfretin>`_
- 3
* - :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>`_
- 3
* - :raw-html-m2r:`<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
@@ -253,9 +256,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/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
@@ -287,4 +287,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-08-28.
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-10-20.

+ 22
- 0
docs/CHANGELOG.rst 查看文件

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

`1.2.1 <https://github.com/saltstack-formulas/apache-formula/compare/v1.2.0...v1.2.1>`_ (2021-10-20)
--------------------------------------------------------------------------------------------------------

Bug Fixes
^^^^^^^^^


* **vhosts:** reset ``cleanup`` to previous and use dedicated ``clean`` SLS (\ `0c6c1d3 <https://github.com/saltstack-formulas/apache-formula/commit/0c6c1d36e261ae6f851cb9b6ed2d1319af460a73>`_\ )

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


* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] (\ `a3d49f1 <https://github.com/saltstack-formulas/apache-formula/commit/a3d49f185274efc6d1530580daf03b1ad2be0e2d>`_\ )
* test for upstream Salt regressions in ``master`` instances (2021-W37a) (\ `69dcfd9 <https://github.com/saltstack-formulas/apache-formula/commit/69dcfd9c3bf49416e6c77d8e982446d99af3b95c>`_\ )

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


* **readme:** document vhosts clean/cleanup (\ `2d72dff <https://github.com/saltstack-formulas/apache-formula/commit/2d72dff82bdcf9c0d30f6735c315a655ebea483d>`_\ ), closes `#372 <https://github.com/saltstack-formulas/apache-formula/issues/372>`_

`1.2.0 <https://github.com/saltstack-formulas/apache-formula/compare/v1.1.8...v1.2.0>`_ (2021-08-28)
--------------------------------------------------------------------------------------------------------


+ 1
- 1
docs/antora.yml 查看文件

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

+ 6
- 6
docs/modules/ROOT/pages/AUTHORS.adoc 查看文件

@@ -12,7 +12,7 @@ _descending_ order.

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

|image::https://avatars.githubusercontent.com/u/1920805?v=4[@alxwr,36,36]
|https://github.com/alxwr[@alxwr^]
@@ -154,6 +154,10 @@ _descending_ order.
|https://github.com/vincentfretin[@vincentfretin^]
|3

|image::https://avatars.githubusercontent.com/u/751889?v=4[@Yoda-BZH,36,36]
|https://github.com/Yoda-BZH[@Yoda-BZH^]
|3

|image::https://avatars.githubusercontent.com/u/1079875?v=4[@bogdanr,36,36]
|https://github.com/bogdanr[@bogdanr^]
|2
@@ -331,10 +335,6 @@ _descending_ order.
|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
@@ -376,4 +376,4 @@ _descending_ order.

Auto-generated by a https://github.com/myii/maintainer[forked version^]
of https://github.com/gaocegege/maintainer[gaocegege/maintainer^] on
2021-08-28.
2021-10-20.

+ 88
- 60
docs/modules/ROOT/pages/CHANGELOG.adoc 查看文件

@@ -2,6 +2,28 @@

:sectnums!:

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.2.0...v1.2.1++[1.2.1^] (2021-10-20)

=== Bug Fixes

* *vhosts:* reset `+cleanup+` to previous and use dedicated `+clean+`
SLS
(https://github.com/saltstack-formulas/apache-formula/commit/0c6c1d36e261ae6f851cb9b6ed2d1319af460a73[0c6c1d3^])

=== Continuous Integration

* *kitchen+ci:* update with latest CVE pre-salted images [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/a3d49f185274efc6d1530580daf03b1ad2be0e2d[a3d49f1^])
* test for upstream Salt regressions in `+master+` instances (2021-W37a)
(https://github.com/saltstack-formulas/apache-formula/commit/69dcfd9c3bf49416e6c77d8e982446d99af3b95c[69dcfd9^])

=== Documentation

* *readme:* document vhosts clean/cleanup
(https://github.com/saltstack-formulas/apache-formula/commit/2d72dff82bdcf9c0d30f6735c315a655ebea483d[2d72dff^]),
closes
https://github.com/saltstack-formulas/apache-formula/issues/372[#372^]

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.8...v1.2.0++[1.2.0^] (2021-08-28)

=== Bug Fixes
@@ -14,17 +36,19 @@ https://github.com//documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2

=== Continuous Integration

* *3003.1:* update inc. AlmaLinux, Rocky & `rst-lint` [skip ci]
* *3003.1:* update inc. AlmaLinux, Rocky & `+rst-lint+` [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/2e116ec4123b846edd85b651c9634e03cb102abf[2e116ec^])
* *freebsd:* update with latest pre-salted Vagrant boxes [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/d67958043df41515350a4b02c5de81e0d83eb813[d679580^])
* *gemfile+lock:* use `ssf` customised `inspec` repo [skip ci]
* *gemfile+lock:* use `+ssf+` customised `+inspec+` repo [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/5dd700944b413411fc3557063125f22c1eb6f62a[5dd7009^])
* *kitchen:* move `provisioner` block & update `run_command` [skip ci]
* *kitchen:* move `+provisioner+` block & update `+run_command+` [skip
ci]
(https://github.com/saltstack-formulas/apache-formula/commit/0d1a6dc75d1a781518bf4d7262dbfb4cfbc2c0b9[0d1a6dc^])
* *kitchen+ci:* update with latest `3003.2` pre-salted images [skip ci]
* *kitchen+ci:* update with latest `+3003.2+` pre-salted images [skip
ci]
(https://github.com/saltstack-formulas/apache-formula/commit/d3641d7f0d427d9e8be9d20bd03f84977d1cba22[d3641d7^])
* add Debian 11 Bullseye & update `yamllint` configuration [skip ci]
* add Debian 11 Bullseye & update `+yamllint+` configuration [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/7741b90ff66719c1abfca3fb306d07ee47cbd4c8[7741b90^])

=== Features
@@ -41,9 +65,10 @@ https://github.com//documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2

=== Continuous Integration

* *gitlab-ci:* ignore line to avoid `yamllint` violation [skip ci]
* *gitlab-ci:* ignore line to avoid `+yamllint+` violation [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/a742f4ee00c08e7db34c2f3adcb8c90a58c851aa[a742f4e^])
* *gitlab-ci:* use `pandoc`-enabled `semantic-release` image [skip ci]
* *gitlab-ci:* use `+pandoc+`-enabled `+semantic-release+` image [skip
ci]
(https://github.com/saltstack-formulas/apache-formula/commit/3bf9c6e6a942b86fd16ca4b222bb6a1781f4e09d[3bf9c6e^])
* *kitchen+gitlab:* remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/10ce3822dd7ea9868ee986a08e2ccd48bd0026ee[10ce382^])
@@ -54,26 +79,26 @@ https://github.com//documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2

=== Bug Fixes

* *mod_pagespeed:* add missing colon to `file.directory`
* *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]
* 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`
* *changelog:* regenerate via. `+semantic-release+`
(https://github.com/saltstack-formulas/apache-formula/commit/de8c82c7533e36e720cf2e44c46154cd8cd3f540[de8c82c^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.4...v1.1.5++[1.1.5^] (2021-05-08)

=== Documentation

* *changelog:* regenerate via. `semantic-release`
* *changelog:* regenerate via. `+semantic-release+`
(https://github.com/saltstack-formulas/apache-formula/commit/198d525a6a552c8c83842c26f6c74a43ffcd4b79[198d525^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.3...v1.1.4++[1.1.4^] (2021-05-08)
@@ -85,11 +110,11 @@ https://github.com//documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2

=== Documentation

* *changelog:* regenerate via. `semantic-release`
* *changelog:* regenerate via. `+semantic-release+`
(https://github.com/saltstack-formulas/apache-formula/commit/e1f1fa7d8f3ea5a8c307badcfe890f96f57c580f[e1f1fa7^])
* *changelog:* regenerate via. `semantic-release`
* *changelog:* regenerate via. `+semantic-release+`
(https://github.com/saltstack-formulas/apache-formula/commit/a1be1d21dceb304278e680a5ade56c51882e4a0b[a1be1d2^])
* *changelog:* regenerate via. `semantic-release`
* *changelog:* regenerate via. `+semantic-release+`
(https://github.com/saltstack-formulas/apache-formula/commit/56efd35f85fe049b4cdcbd082e38d547bd306a39[56efd35^])

== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.2...v1.1.3++[1.1.3^] (2021-04-30)
@@ -103,7 +128,7 @@ https://github.com/saltstack-formulas/apache-formula/issues/302[#302^]

=== Continuous Integration

* *kitchen+gitlab:* adjust matrix to add `3003` [skip ci]
* *kitchen+gitlab:* adjust matrix to add `+3003+` [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/3c21740ba52fa5c2b5cf39cddce6a42d13d17988[3c21740^])
* *vagrant:* add FreeBSD 13.0 [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/298fdf4fb569a3d1d4a9dadedb4c3924bcb8cc9a[298fdf4^])
@@ -114,36 +139,37 @@ https://github.com/saltstack-formulas/apache-formula/issues/302[#302^]

=== Bug Fixes

* *freebsd:* fix `default` suite implementation and tests
* *freebsd:* fix `+default+` suite implementation and tests
(https://github.com/saltstack-formulas/apache-formula/commit/0a0f69ee2fc8168696f9f9c4ae786389ff894615[0a0f69e^])
* *freebsd:* fix `modsecurity` suite implementation and tests
* *freebsd:* fix `+modsecurity+` suite implementation and tests
(https://github.com/saltstack-formulas/apache-formula/commit/bc9aa78437d14cf26605f58a3c1e17caed8f05bc[bc9aa78^])

=== Continuous Integration

* enable Vagrant-based testing using GitHub Actions
(https://github.com/saltstack-formulas/apache-formula/commit/6e094e2527748cd4d72690b9289836b17f9289c7[6e094e2^])
* *gemfile+lock:* use `ssf` customised `kitchen-docker` repo [skip ci]
* *gemfile+lock:* use `+ssf+` customised `+kitchen-docker+` repo [skip
ci]
(https://github.com/saltstack-formulas/apache-formula/commit/53ac4638f3b902c1fd65a64d4344387e26c466c1[53ac463^])
* *gitlab-ci:* reset after update hook for `rubocop` [skip ci]
* *gitlab-ci:* reset after update hook for `+rubocop+` [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/6d40ab7634a42048a0f2b3f2e1173cf2da2a8716[6d40ab7^])
* *kitchen+ci:* use latest pre-salted images (after CVE) [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/69e9d304fb7d637df1856e0d8ab66be7ddce86c4[69e9d30^])
* *kitchen+gitlab-ci:* use latest pre-salted images [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/21cb59daa2f70ce6cc46f8d241fb6032c932746c[21cb59d^])
* *pre-commit:* update hook for `rubocop`
* *pre-commit:* update hook for `+rubocop+`
(https://github.com/saltstack-formulas/apache-formula/commit/2c090c3a835e42bd07f0788f4b0965f1c3405662[2c090c3^])

=== Documentation

* *readme:* add `Testing with Vagrant` section
* *readme:* add `+Testing with Vagrant+` section
(https://github.com/saltstack-formulas/apache-formula/commit/5a6b203bb18f9f28146f33af8175fc3b8c059077[5a6b203^])

=== Tests

* standardise use of `share` suite & `_mapdata` state [skip ci]
* 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
* *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)
@@ -155,9 +181,9 @@ https://github.com/saltstack-formulas/apache-formula/issues/302[#302^]

=== Continuous Integration

* *commitlint:* ensure `upstream/master` uses main repo URL [skip ci]
* *commitlint:* ensure `+upstream/master+` uses main repo URL [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/0145922b52f21469c00c85bf46503411ffd11c56[0145922^])
* *gitlab-ci:* add `rubocop` linter (with `allow_failure`) [skip ci]
* *gitlab-ci:* add `+rubocop+` linter (with `+allow_failure+`) [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/bbf012b82eed50db3c35cb25a10d9ca36e40487b[bbf012b^])
* *gitlab-ci:* use GitLab CI as Travis CI replacement
(https://github.com/saltstack-formulas/apache-formula/commit/26208c47c644608b00adfa8474616305e7a55e36[26208c4^])
@@ -236,7 +262,7 @@ https://github.com/saltstack-formulas/apache-formula/issues/302[#302^]

=== Continuous Integration

* *pre-commit:* finalise `rstcheck` configuration [skip ci]
* *pre-commit:* finalise `+rstcheck+` configuration [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/1c2125c251016097e7d2c0694bf0245a3644605e[1c2125c^])

=== Documentation
@@ -244,7 +270,7 @@ https://github.com/saltstack-formulas/apache-formula/issues/302[#302^]
* *example:* document redirect 80->443 fix
https://github.com/saltstack-formulas/apache-formula/issues/226[#226^]
(https://github.com/saltstack-formulas/apache-formula/commit/e15803b4b12df2b6e625673409bc854b1d1dd751[e15803b^])
* *readme:* fix `rstcheck` violation [skip ci]
* *readme:* fix `+rstcheck+` violation [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/2747e35ce1e49d46a1fd5f8613ce73517aaed095[2747e35^]),
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^]
@@ -260,7 +286,7 @@ https://github.com//travis-ci.org/github/myii/apache-formula/builds/731605038/is

* *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]
* *pre-commit:* enable/disable `+rstcheck+` as relevant [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/233111af11dd25b573928e746f19b06bcdbf19b9[233111a^])

=== BREAKING CHANGES
@@ -313,18 +339,18 @@ CHANGE: 'uninstall.sls' symlinked to 'clean.sls'

=== Bug Fixes

* *vhosts/cleanup:* check `sites-enabled` dir exists before listing it
* *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

* *gemfile.lock:* add to repo with updated `Gemfile` [skip ci]
* *gemfile.lock:* add to repo with updated `+Gemfile+` [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/61b903e7803eb80b50130834b90ca86d26b9d6c8[61b903e^])
* *kitchen:* use `saltimages` Docker Hub where available [skip ci]
* *kitchen:* use `+saltimages+` Docker Hub where available [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/6895fb9764e9cebcbbff05763e367401d6cad959[6895fb9^])
* *kitchen+travis:* remove `master-py2-arch-base-latest` [skip ci]
* *kitchen+travis:* remove `+master-py2-arch-base-latest+` [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/16bb1b06e351efdf9994676de38dec7b0ecd639d[16bb1b0^])
* *travis:* add notifications => zulip [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/2417a75fe218bd04c719f8eb2e2a7e402a20928e[2417a75^])
@@ -347,9 +373,10 @@ https://github.com/saltstack-formulas/apache-formula/issues/278[#278^]

=== Continuous Integration

* *kitchen:* avoid using bootstrap for `master` instances [skip ci]
* *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]
* *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)
@@ -370,15 +397,15 @@ https://github.com/saltstack-formulas/apache-formula/issues/278[#278^]

=== Continuous Integration

* *gemfile:* restrict `train` gem version until upstream fix [skip ci]
* *gemfile:* restrict `+train+` gem version until upstream fix [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/13be6f9fac5aae55c48f74c784335c61d7fbaaf2[13be6f9^])
* *travis:* apply changes from build config validation [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/0aac479c253f95b7fdcb1505476638c2d703bc77[0aac479^])
* *travis:* opt-in to `dpl v2` to complete build config validation
* *travis:* opt-in to `+dpl v2+` to complete build config validation
(https://github.com/saltstack-formulas/apache-formula/commit/19e90ea2d6ef91118ebf59817ef4c91ad876af54[19e90ea^])
* *travis:* quote pathspecs used with `git ls-files` [skip ci]
* *travis:* quote pathspecs used with `+git ls-files+` [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/6608ddf8c5a361b93e6a44658ab1e306953566bf[6608ddf^])
* *travis:* run `shellcheck` during lint job [skip ci]
* *travis:* run `+shellcheck+` during lint job [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/2ff6b2f17e1fd48b5f0a4156c2dbd90f07f27025[2ff6b2f^])
* *travis:* use build config validation (beta) [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/73160b249124df6bbd36b113df71724c019a118f[73160b2^])
@@ -406,54 +433,55 @@ https://github.com/saltstack-formulas/apache-formula/issues/278[#278^]

=== Continuous Integration

* *kitchen:* use `debian-10-master-py3` instead of `develop` [skip ci]
* *kitchen:* use `+debian-10-master-py3+` instead of `+develop+` [skip
ci]
(https://github.com/saltstack-formulas/apache-formula/commit/09d82a581caa09298d3d99ded215c5e45c5b619f[09d82a5^])
* *kitchen:* use `develop` image until `master` is ready (`amazonlinux`)
[skip ci]
* *kitchen:* use `+develop+` image until `+master+` is ready
(`+amazonlinux+`) [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/d0bf6f37969a9a97a6e368278e0f9eb40431f2f1[d0bf6f3^])
* *kitchen+travis:* upgrade matrix after `2019.2.2` release [skip ci]
* *kitchen+travis:* upgrade matrix after `+2019.2.2+` release [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/fc0f869b78ef56369e1cfb6ff3d62179f703efa0[fc0f869^])
* *travis:* update `salt-lint` config for `v0.0.10` [skip ci]
* *travis:* update `+salt-lint+` config for `+v0.0.10+` [skip ci]
(https://github.com/saltstack-formulas/apache-formula/commit/2622d48b4ccb01cd70555d46759d79d82d1db7bf[2622d48^])

=== Performance Improvements

* *travis:* improve `salt-lint` invocation [skip ci]
* *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)

=== Bug Fixes

* *apache-2.2.config.jinja:* fix `salt-lint` errors
* *apache-2.2.config.jinja:* fix `+salt-lint+` errors
(https://github.com/saltstack-formulas/apache-formula/commit/f4045ef[f4045ef^])
* *apache-2.4.config.jinja:* fix `salt-lint` errors
* *apache-2.4.config.jinja:* fix `+salt-lint+` errors
(https://github.com/saltstack-formulas/apache-formula/commit/e2c1c2e[e2c1c2e^])
* *flags.sls:* fix `salt-lint` errors
* *flags.sls:* fix `+salt-lint+` errors
(https://github.com/saltstack-formulas/apache-formula/commit/a146c59[a146c59^])
* *init.sls:* fix `salt-lint` errors
* *init.sls:* fix `+salt-lint+` errors
(https://github.com/saltstack-formulas/apache-formula/commit/8465eb4[8465eb4^])
* *map.jinja:* fix `salt-lint` errors
* *map.jinja:* fix `+salt-lint+` errors
(https://github.com/saltstack-formulas/apache-formula/commit/d011324[d011324^])
* *mod_geoip.sls:* fix `salt-lint` errors
* *mod_geoip.sls:* fix `+salt-lint+` errors
(https://github.com/saltstack-formulas/apache-formula/commit/e55ef9b[e55ef9b^])
* *modsecurity.conf.jinja:* fix `salt-lint` errors
* *modsecurity.conf.jinja:* fix `+salt-lint+` errors
(https://github.com/saltstack-formulas/apache-formula/commit/2a79d05[2a79d05^])
* *modules.sls:* fix `salt-lint` errors
* *modules.sls:* fix `+salt-lint+` errors
(https://github.com/saltstack-formulas/apache-formula/commit/55d11f8[55d11f8^])
* *server_status.sls:* fix `salt-lint` errors
* *server_status.sls:* fix `+salt-lint+` errors
(https://github.com/saltstack-formulas/apache-formula/commit/da9a592[da9a592^])
* *uninstall.sls:* fix `salt-lint` errors
* *uninstall.sls:* fix `+salt-lint+` errors
(https://github.com/saltstack-formulas/apache-formula/commit/ed7dc7b[ed7dc7b^])
* *vhosts/cleanup.sls:* fix `salt-lint` errors
* *vhosts/cleanup.sls:* fix `+salt-lint+` errors
(https://github.com/saltstack-formulas/apache-formula/commit/b0bbd0b[b0bbd0b^])
* *vhosts/minimal.tmpl:* fix `salt-lint` errors
* *vhosts/minimal.tmpl:* fix `+salt-lint+` errors
(https://github.com/saltstack-formulas/apache-formula/commit/146dc67[146dc67^])
* *vhosts/proxy.tmpl:* fix `salt-lint` errors
* *vhosts/proxy.tmpl:* fix `+salt-lint+` errors
(https://github.com/saltstack-formulas/apache-formula/commit/e7c9fbb[e7c9fbb^])
* *vhosts/redirect.tmpl:* fix `salt-lint` errors
* *vhosts/redirect.tmpl:* fix `+salt-lint+` errors
(https://github.com/saltstack-formulas/apache-formula/commit/0a41b19[0a41b19^])
* *vhosts/standard.tmpl:* fix `salt-lint` errors
* *vhosts/standard.tmpl:* fix `+salt-lint+` errors
(https://github.com/saltstack-formulas/apache-formula/commit/1bad58d[1bad58d^])
* *yamllint:* fix all errors
(https://github.com/saltstack-formulas/apache-formula/commit/97f6ead[97f6ead^])
@@ -462,7 +490,7 @@ https://github.com/saltstack-formulas/apache-formula/issues/278[#278^]

* *formula:* use standard structure
(https://github.com/saltstack-formulas/apache-formula/commit/701929d[701929d^])
* *readme:* move to `docs/` directory and modify accordingly
* *readme:* move to `+docs/+` directory and modify accordingly
(https://github.com/saltstack-formulas/apache-formula/commit/6933f0e[6933f0e^])

=== Features

+ 78
- 70
docs/modules/ROOT/pages/README.adoc 查看文件

@@ -17,8 +17,8 @@ attention to the
https://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html#writing-formulas[Writing
Formula Section].

If you want to use this formula, please pay attention to the `FORMULA`
file and/or `git tag`, which contains the currently released version.
If you want to use this formula, please pay attention to the `+FORMULA+`
file and/or `+git tag+`, which contains the currently released version.
This formula is versioned according to http://semver.org/[Semantic
Versioning].

@@ -36,98 +36,98 @@ to contribute] for more details.

== 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)
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 +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.
@@ -202,29 +202,29 @@ 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:
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
@@ -266,9 +266,17 @@ apache:
SSLCertificateChainFile: /path/to/ssl.ca.crt
----

=== `+apache.config.vhosts.clean+`

Remove non-declared virtual hosts, and deactivates the service.

=== `+apache.config.vhosts.cleanup+`

Remove non-declared virtual hosts, but keeps the service running.

== Testing

Linux testing is done with `kitchen-salt`.
Linux testing is done with `+kitchen-salt+`.

=== Requirements

@@ -282,34 +290,34 @@ $ bundle install
$ bin/kitchen test [platform]
----

Where `[platform]` is the platform name defined in `kitchen.yml`, e.g.
`debian-9-2019-2-py3`.
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.
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.
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`.
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

Windows/FreeBSD/OpenBSD testing is done with `kitchen-salt`.
Windows/FreeBSD/OpenBSD testing is done with `+kitchen-salt+`.

=== Requirements

@@ -326,13 +334,13 @@ $ bundle install --with=vagrant
$ bin/kitchen test [platform]
----

Where `[platform]` is the platform name defined in
`kitchen.vagrant.yml`, e.g. `windows-81-latest-py3`.
Where `+[platform]+` is the platform name defined in
`+kitchen.vagrant.yml+`, e.g. `+windows-81-latest-py3+`.

=== Note

When testing using Vagrant you must set the environment variable
`KITCHEN_LOCAL_YAML` to `kitchen.vagrant.yml`. For example:
`+KITCHEN_LOCAL_YAML+` to `+kitchen.vagrant.yml+`. For example:

[source,bash]
----
@@ -343,24 +351,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
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.
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`.
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.

Write Preview
Loading…
取消
儲存