Commit Graph

596 Commits

Author SHA1 Message Date
noelmcloughlin
e15803b4b1 docs(example): document redirect 80->443 fix #226 2020-10-05 19:30:26 +01:00
semantic-release-bot
5ef7662176 chore(release): 1.0.0 [skip ci]
# [1.0.0](https://github.com/saltstack-formulas/apache-formula/compare/v0.41.1...v1.0.0) (2020-10-05)

### Code Refactoring

* **formula:** align to template-formula & improve ci features ([47818fc](47818fc360))

### Continuous Integration

* **pre-commit:** add to formula [skip ci] ([5532ed7](5532ed7a5b))
* **pre-commit:** enable/disable `rstcheck` as relevant [skip ci] ([233111a](233111af11))

### BREAKING CHANGES

* **formula:** 'apache.sls' converted to new style 'init.ssl'
* **formula:** "logrotate.sls" became "config/logrotate.sls"
* **formula:** "debian_full.sls" became "config/debian_full.sls"
* **formula:** "flags.sls" became "config/flags.sls"
* **formula:** "manage_security" became "config/manage_security.sls"
* **formula:** "mod_*.sls" became "config/mod_*.sls"
* **formula:** "no_default_host.sls" became "config/no_default_host.sls"
* **formula:** "own_default_host.sls" became "config/own_default_host.sls"
* **formula:** "register_site.sls" became "config/register_site.sls"
* **formula:** "server_status.sls" became "config/server_status.sls"
* **formula:** "vhosts/" became "config/vhosts/"
* **formula:** "mod_security/" became "config/mod_security/"

NOT-BREAKING CHANGE: 'config.sls' became 'config/init.sls'
NOT-BREAKING CHANGE: 'uninstall.sls' symlinked to 'clean.sls'
2020-10-05 14:15:41 +00:00
N
90432892d3
Merge pull request #283 from noelmcloughlin/refactor
refactor(formula): align to template-formula & improve ci
2020-10-05 15:04:15 +01:00
noelmcloughlin
47818fc360 refactor(formula): align to template-formula & improve ci features
FEATURE: Archlinux support
FEATURE: Windows support
FEATURE: Enhanced CI/CD
FEATURE: modular states

BREAKING CHANGE: 'apache.sls' converted to new style 'init.ssl'
BREAKING CHANGE: "logrotate.sls" became "config/logrotate.sls"
BREAKING CHANGE: "debian_full.sls" became "config/debian_full.sls"
BREAKING CHANGE: "flags.sls" became "config/flags.sls"
BREAKING CHANGE: "manage_security" became "config/manage_security.sls"
BREAKING CHANGE: "mod_*.sls" became "config/mod_*.sls"
BREAKING CHANGE: "no_default_host.sls" became "config/no_default_host.sls"
BREAKING CHANGE: "own_default_host.sls" became "config/own_default_host.sls"
BREAKING CHANGE: "register_site.sls" became "config/register_site.sls"
BREAKING CHANGE: "server_status.sls" became "config/server_status.sls"
BREAKING CHANGE: "vhosts/" became "config/vhosts/"
BREAKING CHANGE: "mod_security/" became "config/mod_security/"

NOT-BREAKING CHANGE: 'config.sls' became 'config/init.sls'
NOT-BREAKING CHANGE: 'uninstall.sls' symlinked to 'clean.sls'
2020-10-05 14:24:15 +01:00
Imran Iqbal
233111af11
ci(pre-commit): enable/disable rstcheck as relevant [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/262
2020-10-05 00:13:55 +01:00
Dafydd Jones
5532ed7a5b
ci(pre-commit): add to formula [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/259
2020-10-03 10:17:10 +01:00
semantic-release-bot
fa93df9f4b chore(release): 0.41.1 [skip ci]
## [0.41.1](https://github.com/saltstack-formulas/apache-formula/compare/v0.41.0...v0.41.1) (2020-07-20)

### Bug Fixes

* **server-status:** enable module in Debian family ([632802a](632802a5a9))
* **server-status:** manage module in debian ([eafa419](eafa4196d9))

### Tests

* **default+modules:** add modules' tests suite ([b253625](b25362535a))
2020-07-20 09:06:07 +00:00
Imran Iqbal
cb47ee30bf
Merge pull request #280 from netmanagers/master
fix(server-status): enable module in debian if `server_status_require…
2020-07-20 09:59:04 +01:00
Javier Bértoli
632802a5a9 fix(server-status): enable module in Debian family 2020-07-19 09:26:39 -03:00
Javier Bértoli
b25362535a test(default+modules): add modules' tests suite 2020-07-18 13:23:58 -03:00
Javier Bértoli
eafa4196d9 fix(server-status): manage module in debian 2020-07-18 07:28:58 -03:00
semantic-release-bot
3adbbcbe0c chore(release): 0.41.0 [skip ci]
# [0.41.0](https://github.com/saltstack-formulas/apache-formula/compare/v0.40.0...v0.41.0) (2020-07-16)

### Features

* **vhosts/standard:** add support for ScriptAlias in standard vhost ([b88b437](b88b437308))
2020-07-16 19:09:25 +00:00
Imran Iqbal
5a186de875
Merge pull request #282 from bawuenet/script_alias
feat: Add support for ScriptAlias in standard vhost
2020-07-16 20:01:05 +01:00
semantic-release-bot
0b61124520 chore(release): 0.40.0 [skip ci]
# [0.40.0](https://github.com/saltstack-formulas/apache-formula/compare/v0.39.5...v0.40.0) (2020-07-16)

### Features

* **redhat/apache-2.x.config.jinja:** allow override of default_charset ([648f589](648f589cc3))
2020-07-16 18:52:51 +00:00
Andreas Thienemann
b88b437308 feat(vhosts/standard): add support for ScriptAlias in standard vhost
The standard vhost currently handles a regular Alias configuration
statement, but not the related ScriptAlias.
Add this.
2020-07-16 20:52:22 +02:00
Andreas Thienemann
648f589cc3
feat(redhat/apache-2.x.config.jinja): allow override of default_charset
The current Red Hat config allows to set DefaultCharset to a value.
In certain situations it is necessary to leave it unconfigured thouguh.

Make the content optional, if the value of apache.default_charset is None,
the item is skipped. Otherwise it defaults to UTF-8.
2020-07-16 19:43:54 +01:00
Imran Iqbal
78bd21ad62 chore(gemfile.lock): update to latest gem versions (2020-W27) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/235
2020-07-06 14:22:14 +01:00
Imran Iqbal
a61e818af2 chore(gemfile.lock): update to latest gem versions (2020-W26) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/233
2020-06-26 12:39:07 +01:00
semantic-release-bot
6cd65b4523 chore(release): 0.39.5 [skip ci]
## [0.39.5](https://github.com/saltstack-formulas/apache-formula/compare/v0.39.4...v0.39.5) (2020-06-21)

### Bug Fixes

* **vhosts/cleanup:** check `sites-enabled` dir exists before listing it ([88373e3](88373e38f5)), closes [#278](https://github.com/saltstack-formulas/apache-formula/issues/278)

### Continuous Integration

* **gemfile.lock:** add to repo with updated `Gemfile` [skip ci] ([61b903e](61b903e780))
* **kitchen:** use `saltimages` Docker Hub where available [skip ci] ([6895fb9](6895fb9764))
* **kitchen+travis:** remove `master-py2-arch-base-latest` [skip ci] ([16bb1b0](16bb1b06e3))
* **travis:** add notifications => zulip [skip ci] ([2417a75](2417a75fe2))
* **workflows/commitlint:** add to repo [skip ci] ([2ce966d](2ce966d031))
2020-06-21 22:45:16 +00:00
Yoda-BZH
88373e38f5
fix(vhosts/cleanup): check sites-enabled dir exists before listing it
Co-authored-by: Tristan Charbonneau <tcharbonneau@oceanet-technology.com>

Fix #278
2020-06-21 23:37:12 +01:00
Imran Iqbal
7dacabcd67 chore(gemfile.lock): update to latest gem versions (2020-W25) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/229
2020-06-21 12:51:09 +01:00
Imran Iqbal
6895fb9764 ci(kitchen): use saltimages Docker Hub where available [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/223
2020-06-15 16:47:27 +01:00
Imran Iqbal
9736121f3b chore(gemfile.lock): update to latest gem versions [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/222
2020-06-15 14:58:02 +01:00
Imran Iqbal
aeacb11a2e chore(gemfile.lock): update to latest gem versions [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/221
2020-06-05 22:08:40 +01:00
Imran Iqbal
587e2cc315 chore(gemfile.lock): update to latest gem versions
* Automated using https://github.com/myii/ssf-formula/pull/202
2020-05-28 00:13:30 +01:00
Imran Iqbal
2417a75fe2 ci(travis): add notifications => zulip [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/191
2020-05-21 19:59:27 +01:00
Imran Iqbal
6e630d145a chore(codeowners): update semantic-release related files [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/174
2020-05-04 23:11:25 +01:00
Imran Iqbal
38952f09a3 chore(codeowners): add to repo [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/173
2020-05-04 22:39:08 +01:00
Imran Iqbal
2ce966d031 ci(workflows/commitlint): add to repo [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/172
2020-05-04 09:25:20 +01:00
Imran Iqbal
16bb1b06e3 ci(kitchen+travis): remove master-py2-arch-base-latest [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/167
2020-05-02 04:23:10 +01:00
Imran Iqbal
61b903e780 ci(gemfile.lock): add to repo with updated Gemfile [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/163
2020-04-21 21:35:31 +01:00
Imran Iqbal
54e3bd95af chore(rubocop): use org-wide standard settings for Metrics/BlockLength [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/158
2020-04-18 13:27:32 +01:00
semantic-release-bot
c5a1b56714 chore(release): 0.39.4 [skip ci]
## [0.39.4](https://github.com/saltstack-formulas/apache-formula/compare/v0.39.3...v0.39.4) (2020-04-02)

### Bug Fixes

* **mod_ssl:** update mod_ssl package variable to prevent clashes ([5591be2](5591be26fd))
2020-04-02 16:36:33 +00:00
Andreas Thienemann
5591be26fd
fix(mod_ssl): update mod_ssl package variable to prevent clashes
The mod_ssl package name could be overridden in apache:lookup:mod_ssl.
Due to the way lookup keys are merged into the main apache dictionary,
the package name clashed with the mod_ssl configuration defined under
apache:mod_ssl.

Fix that by renaming the mod_ssl package variable to mod_ssl_pkg.

Drive-By: Add mod_ssl_pkg to the pillar.example file.
2020-04-02 17:29:06 +01:00
semantic-release-bot
01d7f656bc chore(release): 0.39.3 [skip ci]
## [0.39.3](https://github.com/saltstack-formulas/apache-formula/compare/v0.39.2...v0.39.3) (2020-04-02)

### Bug Fixes

* **debian:** generate remoteip conf before a2enconf ([1ed69f6](1ed69f6c6f))

### Continuous Integration

* **kitchen:** avoid using bootstrap for `master` instances [skip ci] ([275b5d5](275b5d5e69))
* **travis:** use `major.minor` for `semantic-release` version [skip ci] ([08cced2](08cced2913))
2020-04-02 16:22:18 +00:00
Imran Iqbal
e7f90a6c8c
Merge pull request #276 from scambra/patch-1
generate remoteip conf before a2enconf
2020-04-02 17:14:23 +01:00
Imran Iqbal
72eadc7da1 chore(gitignore): update from the template-formula [skip ci]
* Checked using https://github.com/myii/ssf-formula/pull/132
2020-02-14 22:24:29 +00:00
Imran Iqbal
9e5b575318 chore(rubocop): move LineLength cop from Metrics to Layout [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/129
2020-02-14 12:47:25 +00:00
Imran Iqbal
275b5d5e69 ci(kitchen): avoid using bootstrap for master instances [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/124
2020-02-05 13:57:56 +00:00
Sergio Cambra
1ed69f6c6f fix(debian): generate remoteip conf before a2enconf 2020-01-27 22:43:05 +01:00
Imran Iqbal
08cced2913 ci(travis): use major.minor for semantic-release version [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/112
2019-12-22 00:47:33 +00:00
semantic-release-bot
18ac07b36d chore(release): 0.39.2 [skip ci]
## [0.39.2](https://github.com/saltstack-formulas/apache-formula/compare/v0.39.1...v0.39.2) (2019-12-20)

### Bug Fixes

* **redhat:** add user & group lookup to configs ([36ad2b2](36ad2b2442))
2019-12-20 17:46:25 +00:00
Chris Horne
36ad2b2442 fix(redhat): add user & group lookup to configs 2019-12-20 17:38:01 +00:00
semantic-release-bot
ada208f9bc chore(release): 0.39.1 [skip ci]
## [0.39.1](https://github.com/saltstack-formulas/apache-formula/compare/v0.39.0...v0.39.1) (2019-12-20)

### Bug Fixes

* **mod_mpm:** cast to int to avoid Jinja type mismatch error ([21045c7](21045c7a7b))
2019-12-20 16:59:57 +00:00
Imran Iqbal
e5579930e7
Merge pull request #272 from dimitry-unified-streaming/fix-mpm_prefork-jinja
fix(mod_mpm): cast to int to avoid Jinja type mismatch error
2019-12-20 16:52:13 +00:00
semantic-release-bot
76bfb1b2d2 chore(release): 0.39.0 [skip ci]
# [0.39.0](https://github.com/saltstack-formulas/apache-formula/compare/v0.38.2...v0.39.0) (2019-12-20)

### Continuous Integration

* **gemfile:** restrict `train` gem version until upstream fix [skip ci] ([13be6f9](13be6f9fac))
* **travis:** apply changes from build config validation [skip ci] ([0aac479](0aac479c25))
* **travis:** opt-in to `dpl v2` to complete build config validation ([19e90ea](19e90ea2d6))
* **travis:** quote pathspecs used with `git ls-files` [skip ci] ([6608ddf](6608ddf8c5))
* **travis:** run `shellcheck` during lint job [skip ci] ([2ff6b2f](2ff6b2f17e))
* **travis:** use build config validation (beta) [skip ci] ([73160b2](73160b2491))

### Features

* **server-status:** allow remote servers to reach server-status page ([a3c0022](a3c0022d79))
2019-12-20 16:51:40 +00:00
Imran Iqbal
d78d0cc166
Merge pull request #273 from mcarlton00/server-status-sources
Allow remote servers to access server status page
2019-12-20 16:43:11 +00:00
mcarlton00
a3c0022d79 feat(server-status): allow remote servers to reach server-status page 2019-12-20 11:20:26 -05:00
Dimitry Andric
21045c7a7b fix(mod_mpm): cast to int to avoid Jinja type mismatch error
This fixes the following error when Jinja tries to process
`mpm_prefork.conf.jinja` or `00-mpm.conf.jinja`, when it processes the
`max_request_workers` comparison:

```
Unable to manage file: Jinja error: '>=' not supported between instances of 'str' and 'int'
[...]
<IfModule mpm_prefork_module>
  StartServers {{ mpm_param['start_servers'] | d('5') }}
  MaxRequestWorkers {{ mpm_param['max_request_workers'] | d('150') }}
{%- if mpm_param['max_request_workers'] | d('150') >= 256 %}    <======================
  ServerLimit {{ mpm_param['max_request_workers'] | d('150') }}
{%- endif %}
  MinSpareServers {{ mpm_param['min_spare_servers'] | d('5') }}
  MaxSpareServers {{ mpm_param['max_spare_servers'] | d('10') }}
  MaxConnectionsPerChild {{ mpm_param['max_connections_per_child'] | d('0') }}
```

Add filters that convert the values to an int first.
2019-12-20 13:24:37 +01:00
Imran Iqbal
13be6f9fac ci(gemfile): restrict train gem version until upstream fix [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/110
2019-12-16 13:35:22 +00:00