saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
637 Commits 6 Branches 31 Tags 1.8 MiB
a8b87a583e
Commit Graph

637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Benjamin Neff
c17601ee42
fix(debian): fix default moddir on debian 2020-10-13 23:56:20 +02:00
semantic-release-bot
22b09abb4b chore(release): 1.0.3 [skip ci] 
## [1.0.3](https://github.com/saltstack-formulas/apache-formula/compare/v1.0.2...v1.0.3) (2020-10-13)

### Bug Fixes

* **config:** fix old apache.service usage ([32f05e5](32f05e5a66))
 2020-10-13 07:52:01 +00:00
N
b200780d4c
Merge pull request #289 from SuperTux88/fix-service-name 
fix(config): fix old apache.service usage
 2020-10-13 08:41:40 +01:00
Benjamin Neff
32f05e5a66
fix(config): fix old apache.service usage 2020-10-13 02:42:52 +02:00
semantic-release-bot
c5fffd2c78 chore(release): 1.0.2 [skip ci] 
## [1.0.2](https://github.com/saltstack-formulas/apache-formula/compare/v1.0.1...v1.0.2) (2020-10-12)

### Bug Fixes

* **package:** remove own_default_vhost and debian_full from config.init ([7691b58](7691b589d7))
* **package:** remove own_default_vhost and debian_full from config.init ([441459e](441459e56f))
 2020-10-12 08:07:54 +00:00
N
45308ffbf8
Merge pull request #288 from gaetanars/master 
Remove own_default_vhost and debian_full from config.init.
 2020-10-12 08:57:26 +01:00
Gaëtan Ars
7691b589d7 fix(package): remove own_default_vhost and debian_full from config.init 2020-10-12 08:58:59 +02:00
Gaëtan Ars
441459e56f fix(package): remove own_default_vhost and debian_full from config.init 2020-10-12 08:57:48 +02:00
Gaëtan
f465b85d67 Remove own_default_vhost and debian_full from config.init. 2020-10-12 08:31:29 +02:00
semantic-release-bot
8c93110a60 chore(release): 1.0.1 [skip ci] 
## [1.0.1](https://github.com/saltstack-formulas/apache-formula/compare/v1.0.0...v1.0.1) (2020-10-10)

### Continuous Integration

* **pre-commit:** finalise `rstcheck` configuration [skip ci] ([1c2125c](1c2125c251))

### Documentation

* **example:** document redirect 80->443 fix [#226](https://github.com/saltstack-formulas/apache-formula/issues/226) ([e15803b](e15803b4b1))
* **readme:** fix `rstcheck` violation [skip ci] ([2747e35](2747e35ce1)), closes [/travis-ci.org/github/myii/apache-formula/builds/731605038#L255](https://github.com//travis-ci.org/github/myii/apache-formula/builds/731605038/issues/L255)
 2020-10-10 16:06:06 +00:00
N
3830ba436f
Merge pull request #284 from noelmcloughlin/docs 
docs(example): document redirect 80->443 fix #226
 2020-10-10 16:54:46 +01:00
noelmcloughlin
e0043dd7ba docs(readme): add mod watchdog to pillar example 2020-10-10 16:32:09 +01:00
Imran Iqbal
1c2125c251
ci(pre-commit): finalise rstcheck configuration [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/267
 2020-10-10 06:42:53 +01:00
Imran Iqbal
2747e35ce1
docs(readme): fix rstcheck violation [skip ci] 
https://travis-ci.org/github/myii/apache-formula/builds/731605038#L255

```
docs/README.rst:151: (ERROR/3) Unknown target name: "apache mod_security2 waf`<http://modsecurity.org/>".
```
 2020-10-10 00:41:02 +01:00
Dafydd Jones
602dd57896
chore(commitlint): add {body,footer,header}-max(-line)-length [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/265
 2020-10-07 09:01:00 +01:00
Imran Iqbal
cecf1d9810
chore(gemfile+lock): update to latest gem versions (2020-W41) [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/263
 2020-10-06 23:58:32 +01:00
Imran Iqbal
7dc0ece4f5
chore: standardise structure [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/264
 2020-10-06 23:26:09 +01:00
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