Commit Graph

663 Commits

Author SHA1 Message Date
Imran Iqbal
298fdf4fb5
ci(vagrant): add FreeBSD 13.0 [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/316
2021-04-20 00:20:27 +01:00
Imran Iqbal
f354ace8e7
ci(vagrant): use pre-salted boxes & conditional local settings [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/311
2021-04-05 18:53:39 +01:00
Imran Iqbal
c8ac6a89b9
chore: update CODEOWNERS & .yamllint re: kitchen-vagrant [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/310
2021-04-05 18:14:32 +01:00
semantic-release-bot
18850c5f44 chore(release): 1.1.2 [skip ci]
## [1.1.2](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.1...v1.1.2) (2021-04-03)

### Bug Fixes

* **freebsd:** fix `default` suite implementation and tests ([0a0f69e](0a0f69ee2f))
* **freebsd:** fix `modsecurity` suite implementation and tests ([bc9aa78](bc9aa78437))

### Continuous Integration

* enable Vagrant-based testing using GitHub Actions ([6e094e2](6e094e2527))
* **gemfile+lock:** use `ssf` customised `kitchen-docker` repo [skip ci] ([53ac463](53ac4638f3))
* **gitlab-ci:** reset after update hook for `rubocop` [skip ci] ([6d40ab7](6d40ab7634))
* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] ([69e9d30](69e9d304fb))
* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] ([21cb59d](21cb59daa2))
* **pre-commit:** update hook for `rubocop` ([2c090c3](2c090c3a83))

### Documentation

* **readme:** add `Testing with Vagrant` section ([5a6b203](5a6b203bb1))

### Tests

* standardise use of `share` suite & `_mapdata` state [skip ci] ([e7c2d20](e7c2d20f06))
* **nomodsecurity:** use adjusted `modules` suite instead ([838b917](838b917221))
2021-04-03 22:50:52 +00:00
Imran Iqbal
0df537a2da
Merge pull request #301 from myii/ci/add-freebsd-vagrant-in-github-actions
ci: enable Vagrant-based testing using GitHub Actions
2021-04-03 23:29:09 +01:00
Imran Iqbal
5a6b203bb1
docs(readme): add Testing with Vagrant section 2021-04-03 23:07:45 +01:00
Imran Iqbal
6e094e2527
ci: enable Vagrant-based testing using GitHub Actions
* Semi-automated using https://github.com/myii/ssf-formula/pull/309
2021-04-03 23:01:50 +01:00
Imran Iqbal
bc9aa78437
fix(freebsd): fix modsecurity suite implementation and tests 2021-04-03 23:01:44 +01:00
Imran Iqbal
0a0f69ee2f
fix(freebsd): fix default suite implementation and tests 2021-04-03 23:01:21 +01:00
Imran Iqbal
e7c2d20f06
test: standardise use of share suite & _mapdata state [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/302
2021-03-23 21:23:32 +00:00
Imran Iqbal
69e9d304fb
ci(kitchen+ci): use latest pre-salted images (after CVE) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/299
2021-03-07 22:14:18 +00:00
Imran Iqbal
955ed1fba3
chore(yamllint): add .git/ to ignores [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/297
2021-03-05 18:28:17 +00:00
Daniel Dehennin
edb2558faa
chore(rubocop): allow use of YAML.load for _mapdata.rb [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/296
2021-02-23 21:43:08 +00:00
Dafydd Jones
ee180fbec7
chore(shellcheck): switch hook for shellcheck [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/295
2021-02-21 08:25:53 +00:00
Imran Iqbal
53ac4638f3
ci(gemfile+lock): use ssf customised kitchen-docker repo [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/294
2021-02-17 13:45:51 +00:00
Imran Iqbal
21cb59daa2
ci(kitchen+gitlab-ci): use latest pre-salted images [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/293
2021-02-13 22:25:31 +00:00
Imran Iqbal
838b917221
test(nomodsecurity): use adjusted modules suite instead 2021-02-13 16:35:56 +00:00
Imran Iqbal
f35054dd82
chore: standardise structure (.gitignore & _mapdata.rb) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/292
2021-02-11 11:44:53 +00:00
Imran Iqbal
6d40ab7634
ci(gitlab-ci): reset after update hook for rubocop [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/290
2021-02-01 23:56:16 +00:00
Imran Iqbal
2c090c3a83
ci(pre-commit): update hook for rubocop
* Automated using https://github.com/myii/ssf-formula/pull/290
2021-02-01 22:20:23 +00:00
Marius van Witzenburg
22c647eb5c
feature(trust): improved remote ip internal proxy support (#300)
* feat(trusted_proxy): Add support for RemoteIPInternalProxy

* fix(syntax): add semicolon
2021-01-08 11:33:46 +00:00
semantic-release-bot
6c529330e6 chore(release): 1.1.1 [skip ci]
## [1.1.1](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.0...v1.1.1) (2021-01-04)

### Bug Fixes

* **memory:** pass variable not dict ([2830081](28300814fc))

### Continuous Integration

* **commitlint:** ensure `upstream/master` uses main repo URL [skip ci] ([0145922](0145922b52))
* **gitlab-ci:** add `rubocop` linter (with `allow_failure`) [skip ci] ([bbf012b](bbf012b82e))
* **gitlab-ci:** use GitLab CI as Travis CI replacement ([26208c4](26208c47c6))
2021-01-04 22:57:35 +00:00
sticky-note
c792cc24d5
Merge pull request #299 from noelmcloughlin/fixit
fix(memory): pass variable not dict
2021-01-05 09:49:28 +11:00
Imran Iqbal
0145922b52
ci(commitlint): ensure upstream/master uses main repo URL [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/278
2020-12-20 18:41:44 +00:00
Imran Iqbal
bbf012b82e
ci(gitlab-ci): add rubocop linter (with allow_failure) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/277
2020-12-19 14:24:21 +00:00
Imran Iqbal
26208c47c6
ci(gitlab-ci): use GitLab CI as Travis CI replacement
* Automated using https://github.com/myii/ssf-formula/pull/275
2020-12-16 06:18:12 +00:00
noelmcloughlin
28300814fc fix(memory): pass variable not dict 2020-12-08 20:46:27 +00:00
N
0e93df3e1e
Merge pull request #298 from bawuenet/master
Do not pass full apache context to vhost templates.
2020-12-08 20:25:35 +00:00
Andreas Thienemann
1f488b6af3 Do not pass full apache context to vhost templates.
The full apache context variable can grow quite large if using multiple
vhosts with SSL certificates.
With 200 sites the apache variable is being rendered 200 times which resuls
in observed renderer output of about 950MB...

state.apply will result with MemoryErrors in such cases.

This PR modifies the templating code to _only_ use a per site context
and pass a trimmed down copy of the apache context instead of the full.

Drive-By: Correct indentation for context variables.
Drive-By: Remove duplicate map/apache functionality. Only use map.
2020-12-08 21:13:07 +01:00
Imran Iqbal
e2e1be18e0
chore(gemfile+lock): update to latest gem versions (2020-W44) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/274
2020-10-26 22:44:39 +00:00
Imran Iqbal
a9509bd56b
chore(gemfile+lock): update to latest gem versions (2020-W43) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/273
2020-10-20 10:13:26 +01:00
semantic-release-bot
b3a7e0b0e6 chore(release): 1.1.0 [skip ci]
# [1.1.0](https://github.com/saltstack-formulas/apache-formula/compare/v1.0.5...v1.1.0) (2020-10-14)

### Bug Fixes

* **ssl.conf:** fix pillar keys for SSLStapling in ssl.conf on debian ([65043f8](65043f8a61))

### Code Refactoring

* **ssl.conf:** reduce newlines in ssl.conf on debian ([b99b7b7](b99b7b71ad))
* **vhosts:** reduce empty lines in standard.tmpl and proxy.tmpl ([4b79c1d](4b79c1dddb))

### Features

* **ssl.conf:** add SSLSessionTickets to ssl.conf on debian ([41a7a83](41a7a83af0))
2020-10-14 23:55:22 +00:00
N
eef745c232
Merge pull request #292 from SuperTux88/fix-ssl-conf
Refactor ssl.conf for debian
2020-10-15 00:29:56 +01:00
N
c2c3b7c848
Merge pull request #293 from SuperTux88/refactor-vhosts-template
refactor(vhosts): reduce empty lines in standard.tmpl and proxy.tmpl
2020-10-15 00:22:37 +01:00
Benjamin Neff
4b79c1dddb
refactor(vhosts): reduce empty lines in standard.tmpl and proxy.tmpl 2020-10-15 00:29:27 +02:00
Benjamin Neff
41a7a83af0
feat(ssl.conf): add SSLSessionTickets to ssl.conf on debian 2020-10-14 22:09:37 +02:00
Benjamin Neff
65043f8a61
fix(ssl.conf): fix pillar keys for SSLStapling in ssl.conf on debian 2020-10-14 22:05:41 +02:00
Benjamin Neff
b99b7b71ad
refactor(ssl.conf): reduce newlines in ssl.conf on debian 2020-10-14 22:04:01 +02:00
semantic-release-bot
50fe24d9f0 chore(release): 1.0.5 [skip ci]
## [1.0.5](https://github.com/saltstack-formulas/apache-formula/compare/v1.0.4...v1.0.5) (2020-10-14)

### Bug Fixes

* **clean:** remove entire apache config directory ([cac5f35](cac5f357a4))

### Code Refactoring

* **package:** remove unnecessary state ([fb81d8e](fb81d8e694))

### Documentation

* **readme:** add mod watchdog to pillar example ([e0043dd](e0043dd7ba))
2020-10-14 19:54:53 +00:00
N
ef06f5c518
Merge pull request #286 from noelmcloughlin/clean
fix(clean): remove entire apache config directory
2020-10-14 20:42:27 +01:00
N
2e10c8a11b
Merge pull request #287 from noelmcloughlin/nochange
fix(package): avoid unnecessary state change
2020-10-14 20:41:50 +01:00
noelmcloughlin
cac5f357a4 fix(clean): remove entire apache config directory 2020-10-14 20:08:53 +01:00
noelmcloughlin
fb81d8e694 refactor(package): remove unnecessary state 2020-10-14 20:04:19 +01:00
semantic-release-bot
91f1460ded chore(release): 1.0.4 [skip ci]
## [1.0.4](https://github.com/saltstack-formulas/apache-formula/compare/v1.0.3...v1.0.4) (2020-10-14)

### Bug Fixes

* **debian:** don't execute a2enmod on every run ([5844322](5844322de4))
* **debian:** fix default moddir on debian ([c17601e](c17601ee42))
* **logs:** don't change owners of logfiles with salt ([382e053](382e053c58))
* **vhosts:** replace %O with %b in default LogFormat ([2b52e11](2b52e11a8a))

### Tests

* **pillar:** remove modules that aren't installed from being enabled ([47ec5fc](47ec5fcc34))
2020-10-14 10:59:27 +00:00
N
9a385b4fcd
Merge pull request #290 from SuperTux88/fix-modules-enable
Fix modules enable
2020-10-14 11:44:05 +01:00
N
335f7282a9
Merge pull request #291 from SuperTux88/dont-change-logs
fix(logs): don't change owners of logfiles with salt
2020-10-14 11:42:45 +01:00
Benjamin Neff
382e053c58
fix(logs): don't change owners of logfiles with salt
The logs are created by apache or logrotate, but salt shouldn't change
permissions of existing logfiles everytime it runs.
2020-10-14 03:43:06 +02:00
Benjamin Neff
2b52e11a8a
fix(vhosts): replace %O with %b in default LogFormat
%O needs mod_logio, which isn't enabled by default everywhere, so it
also shouldn't be used as default fallback LogFormat.
2020-10-14 02:57:00 +02:00
Benjamin Neff
47ec5fcc34
test(pillar): remove modules that aren't installed from being enabled 2020-10-14 02:03:32 +02:00
Benjamin Neff
5844322de4
fix(debian): don't execute a2enmod on every run 2020-10-14 00:49:20 +02:00