Bläddra i källkod

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
tags/v1.2.0
Fabian Niepelt 3 år sedan
förälder
incheckning
fe0ceb78b7
Inget konto är kopplat till bidragsgivarens mejladress
3 ändrade filer med 15 tillägg och 4 borttagningar
  1. +2
    -2
      apache/osfamilymap.yaml
  2. +6
    -1
      test/integration/default/controls/config_spec.rb
  3. +7
    -1
      test/integration/modules/controls/config_spec.rb

+ 2
- 2
apache/osfamilymap.yaml Visa fil

@@ -109,7 +109,7 @@ Suse:
mod_geoip: apache2-mod_geoip
mod_geoip_database: GeoIP-data

vhostdir: /etc/apache2/sites-available
vhostdir: /etc/apache2/vhosts.d
confdir: /etc/apache2/conf.d
modulesdir: /usr/lib64/apache2/modules
confext: .conf
@@ -119,7 +119,7 @@ Suse:
logrotatedir: /etc/logrotate.d/apache2
wwwdir: /srv/www
moddir: /etc/apache2/mods-enabled
sitesdir: /etc/apache2/sites-enabled
sitesdir: /etc/apache2/vhosts.d

Gentoo:
pkg:

+ 6
- 1
test/integration/default/controls/config_spec.rb Visa fil

@@ -5,11 +5,16 @@ control 'apache configuration' do
title 'should match desired lines'

case platform[:family]
when 'debian', 'suse'
when 'debian'
vhostdir = '/etc/apache2/sites-available'
logrotatedir = '/etc/logrotate.d/apache2'
moddir = '/etc/apache2/mods-enabled'
sitesdir = '/etc/apache2/sites-enabled'
when 'suse'
vhostdir = '/etc/apache2/vhosts.d'
logrotatedir = '/etc/logrotate.d/apache2'
moddir = '/etc/apache2/mods-enabled'
sitesdir = '/etc/apache2/vhosts.d'
when 'redhat', 'fedora'
vhostdir = '/etc/httpd/vhosts.d'
logrotatedir = '/etc/logrotate.d/httpd'

+ 7
- 1
test/integration/modules/controls/config_spec.rb Visa fil

@@ -5,12 +5,18 @@ control 'apache configuration' do

apachectl = 'apachectl -t'
case platform[:family]
when 'debian', 'suse'
when 'debian'
vhostdir = '/etc/apache2/sites-available'
logrotatedir = '/etc/logrotate.d/apache2'
logdir = '/var/log/apache2'
moddir = '/etc/apache2/mods-enabled'
sitesdir = '/etc/apache2/sites-enabled'
when 'suse'
vhostdir = '/etc/apache2/vhosts.d'
logrotatedir = '/etc/logrotate.d/apache2'
logdir = '/var/log/apache2'
moddir = '/etc/apache2/mods-enabled'
sitesdir = '/etc/apache2/vhosts.d'
when 'redhat', 'fedora'
vhostdir = '/etc/httpd/vhosts.d'
logrotatedir = '/etc/logrotate.d/httpd'

Laddar…
Avbryt
Spara