Commit Graph

741 Commits

Author SHA1 Message Date
l00d3r
c4b8538128
fix(redhat): use correct vhostdir, sitesdir and logrotate script for redhat family (#376)
* fix(redhat): use correct dirs for redhat family

Red hat family distributions do not implement sites-enabled nor vhosts.d
directories and all virtual hosts are under /etc/httpd/conf.d

Redhat based distros don't have /etc/init.d/httpd to rotate logs.
Default for them uses systemctl reload to rotate logs
2021-10-28 09:35:24 +01:00
Imran Iqbal
ea777fd102
chore(gemfile.lock): update to latest gem versions (2021-W43) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/381
2021-10-26 11:10:30 +01:00
Imran Iqbal
564971493d
chore(gemfile.lock): update to latest gem versions (2021-W42) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/380
2021-10-23 21:06:07 +01:00
semantic-release-bot
86dc3b3d6f 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)
2021-10-20 09:34:17 +00:00
Imran Iqbal
cde7c5b6db
Merge pull request #374 from Yoda-BZH/master
docs(readme): document vhosts clean/cleanup
2021-10-20 10:22:53 +01:00
Yoda-BZH
f35e7dc32c
Merge pull request #1 from Yoda-BZH/yodabzh-document-states-cleanup
docs(readme): document vhosts clean/cleanup
2021-10-20 11:16:43 +02:00
Yoda-BZH
2d72dff82b
docs(readme): document vhosts clean/cleanup
Linked to #372

Properly document ``apache.config.vhosts.clean`` and ``apache.config.vhosts.cleanup``, and the differences between them.
2021-10-20 11:15:54 +02:00
Imran Iqbal
ce4f4a72c3
Merge pull request #372 from myii/fix/reset-vhosts-cleanup-and-provide-separate-clean
fix(vhosts): reset `cleanup` to previous and use dedicated `clean` SLS
2021-10-20 10:14:41 +01:00
Imran Iqbal
0c6c1d36e2
fix(vhosts): reset cleanup to previous and use dedicated clean SLS 2021-10-20 09:55:32 +01:00
Imran Iqbal
35e9990a9a
chore(gemfile.lock): update to latest gem versions (2021-W41) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/378
2021-10-15 19:04:49 +01:00
Imran Iqbal
ee77d27a4c
chore(gemfile.lock): update to latest gem versions (2021-W40) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/375
2021-10-06 16:59:48 +01:00
Imran Iqbal
a3d49f1852
ci(kitchen+ci): update with latest CVE pre-salted images [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/374
2021-10-05 11:05:24 +01:00
Imran Iqbal
a57d98f4fe
chore(pillar.example): reset after recent fixes [skip ci] 2021-09-30 08:10:59 +01:00
Imran Iqbal
da7cc0cead
chore(gemfile.lock): update to latest gem versions (2021-W39) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/370
2021-09-30 07:07:31 +01:00
Imran Iqbal
16b281a5e9
chore(gemfile.lock): update to latest gem versions (2021-W38) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/369
2021-09-21 11:54:39 +01:00
Imran Iqbal
79165a1f05
can't use clean in the same suite reliably (unless we find a proper way) 2021-09-14 20:55:29 +01:00
Imran Iqbal
86015dea62
final kitchen.yml before commenting out clean states 2021-09-14 20:55:05 +01:00
Imran Iqbal
9d3e62c3cc
all the fixes for clean states to work properly 2021-09-14 20:54:31 +01:00
Imran Iqbal
c4dce07476
got all pkg/config/service running (except those disabled in kitchen.yml) 2021-09-14 19:36:03 +01:00
Imran Iqbal
0222263c65
got basic apache state working 2021-09-14 19:19:09 +01:00
Imran Iqbal
1002efa909
second batch 2021-09-14 18:57:39 +01:00
Imran Iqbal
302db15f95
all suite in kitchen; initial "broken" states already commented out 2021-09-14 18:39:27 +01:00
Imran Iqbal
8682dff6dc
basic fixes 2021-09-14 18:31:28 +01:00
Imran Iqbal
9bbb008325
chore(gemfile.lock): update to latest gem versions (2021-W37) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/368
2021-09-14 09:53:10 +01:00
Imran Iqbal
69dcfd9c3b
ci: test for upstream Salt regressions in master instances (2021-W37a)
* Automated using https://github.com/myii/ssf-formula/pull/999
2021-09-14 08:17:43 +01:00
Imran Iqbal
aff6dd2875
chore(gemfile.lock): update to latest gem versions (2021-W36) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/367
2021-09-08 23:29:59 +01:00
Imran Iqbal
ee8c718cb7
chore(gemfile.lock): update to latest gem versions (2021-W35) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/364
2021-08-30 18:05:21 +01:00
semantic-release-bot
0cbac9c7af chore(release): 1.2.0 [skip ci]
# [1.2.0](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.8...v1.2.0) (2021-08-28)

### Bug Fixes

* **suse:** use correct vhostdir and sitesdir for suse family ([#369](https://github.com/saltstack-formulas/apache-formula/issues/369)) ([fe0ceb7](fe0ceb78b7)), closes [/documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2.html#sec-apache2](https://github.com//documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2.html/issues/sec-apache2)

### Continuous Integration

* **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([2e116ec](2e116ec412))
* **freebsd:** update with latest pre-salted Vagrant boxes [skip ci] ([d679580](d67958043d))
* **gemfile+lock:** use `ssf` customised `inspec` repo [skip ci] ([5dd7009](5dd700944b))
* **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([0d1a6dc](0d1a6dc75d))
* **kitchen+ci:** update with latest `3003.2` pre-salted images [skip ci] ([d3641d7](d3641d7f0d))
* add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([7741b90](7741b90ff6))

### Features

* **alma+rocky:** add platforms (based on CentOS 8) [skip ci] ([4353e57](4353e57a1b))
2021-08-28 23:25:45 +00:00
Fabian Niepelt
fe0ceb78b7
fix(suse): use correct vhostdir and sitesdir for suse family (#369)
The Suse family of distributions does not implement the sites-available/sites-enabled
distinction and puts all vhosts into /etc/apache2/vhosts.d.

Sources:
- https://documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2.html#sec-apache2-configuration-manually
- https://build.opensuse.org/package/view_file/openSUSE:Factory/apache2/apache2-httpd.conf?expand=1
2021-08-29 00:18:10 +01:00
Imran Iqbal
e354631e4d
chore(gemfile.lock): update to latest gem versions (2021-W34) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/362
2021-08-23 09:20:12 +01:00
Imran Iqbal
d3641d7f0d
ci(kitchen+ci): update with latest 3003.2 pre-salted images [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/360
2021-08-19 10:07:56 +01:00
Imran Iqbal
4c2791db7a
chore(gemfile.lock): update to latest gem versions (2021-W33) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/359
2021-08-16 18:20:12 +01:00
Imran Iqbal
b7c157288f
chore(gemfile.lock): update to latest gem versions (2021-W32) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/358
2021-08-09 12:08:38 +01:00
Imran Iqbal
5dd700944b
ci(gemfile+lock): use ssf customised inspec repo [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/357
2021-08-04 21:50:56 +01:00
Imran Iqbal
5cd8a05c06
chore(gemfile.lock): update to latest gem versions (2021-W31) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/356
2021-08-04 21:33:23 +01:00
Imran Iqbal
7732095817
chore(gemfile.lock): update to latest gem versions (2021-W30) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/353
2021-07-26 14:22:24 +01:00
Imran Iqbal
d67958043d
ci(freebsd): update with latest pre-salted Vagrant boxes [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/350
2021-07-22 08:35:16 +01:00
Imran Iqbal
209f624405
chore(gemfile.lock): update to latest gem versions (2021-W29) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/349
2021-07-21 18:25:48 +01:00
Imran Iqbal
7741b90ff6
ci: add Debian 11 Bullseye & update yamllint configuration [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/345
2021-07-18 18:55:20 +01:00
Imran Iqbal
0d1a6dc75d
ci(kitchen): move provisioner block & update run_command [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/344
2021-07-17 21:04:42 +01:00
Imran Iqbal
f51c0fd925
chore(gemfile+lock): update to latest gem versions (2021-W28) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/343
2021-07-17 20:21:54 +01:00
Imran Iqbal
22b0e1b4cb
chore(deps): bump addressable from 2.7.0 to 2.8.0 [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/340
2021-07-14 12:08:14 +01:00
Imran Iqbal
2e116ec412
ci(3003.1): update inc. AlmaLinux, Rocky & rst-lint [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/335
2021-07-01 23:58:05 +01:00
Imran Iqbal
4353e57a1b
feat(alma+rocky): add platforms (based on CentOS 8) [skip ci] 2021-06-30 13:10:34 +01:00
semantic-release-bot
404f1d139c chore(release): 1.1.8 [skip ci]
## [1.1.8](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.7...v1.1.8) (2021-06-28)

### Bug Fixes

* **register_site:** correct semicolon to colon ([4cf848d](4cf848da05))

### Continuous Integration

* **gitlab-ci:** ignore line to avoid `yamllint` violation [skip ci] ([a742f4e](a742f4ee00))
* **gitlab-ci:** use `pandoc`-enabled `semantic-release` image [skip ci] ([3bf9c6e](3bf9c6e6a9))
* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([10ce382](10ce3822dd))
* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([57e9873](57e9873624))
2021-06-28 22:07:57 +00:00
Imran Iqbal
6170f318b4
Merge pull request #307 from mariusvw/hotfix/semicolon-correction
Correct semicolon to colon
2021-06-28 23:00:37 +01:00
Marius van Witzenburg
4cf848da05
fix(register_site): correct semicolon to colon 2021-06-28 14:01:10 +02:00
Imran Iqbal
3bf9c6e6a9
ci(gitlab-ci): use pandoc-enabled semantic-release image [skip ci] 2021-06-21 20:39:48 +01:00
Imran Iqbal
3d0438ce6c
Merge branch '20210621203551' into upstream 2021-06-21 20:35:55 +01:00
Imran Iqbal
10ce3822dd
ci(kitchen+gitlab): remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/331
2021-06-21 20:35:54 +01:00