saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(suse): use correct vhostdir and sitesdir for suse family (#369)

Browse Source 
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
This commit is contained in:
Fabian Niepelt 2021-08-29 01:18:10 +02:00 committed by GitHub
parent e354631e4d
commit fe0ceb78b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apache/osfamilymap.yaml
View File

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

7
test/integration/default/controls/config_spec.rb
View File

@ -5,11 +5,16 @@ control 'apache configuration' do
title 'should match desired lines' title 'should match desired lines'
case platform[:family] case platform[:family]
when 'debian', 'suse' when 'debian'
vhostdir = '/etc/apache2/sites-available' vhostdir = '/etc/apache2/sites-available'
logrotatedir = '/etc/logrotate.d/apache2' logrotatedir = '/etc/logrotate.d/apache2'
moddir = '/etc/apache2/mods-enabled' moddir = '/etc/apache2/mods-enabled'
sitesdir = '/etc/apache2/sites-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' when 'redhat', 'fedora'
vhostdir = '/etc/httpd/vhosts.d' vhostdir = '/etc/httpd/vhosts.d'
logrotatedir = '/etc/logrotate.d/httpd' logrotatedir = '/etc/logrotate.d/httpd'

8
test/integration/modules/controls/config_spec.rb
View File

@ -5,12 +5,18 @@ control 'apache configuration' do
apachectl = 'apachectl -t' apachectl = 'apachectl -t'
case platform[:family] case platform[:family]
when 'debian', 'suse' when 'debian'
vhostdir = '/etc/apache2/sites-available' vhostdir = '/etc/apache2/sites-available'
logrotatedir = '/etc/logrotate.d/apache2' logrotatedir = '/etc/logrotate.d/apache2'
logdir = '/var/log/apache2' logdir = '/var/log/apache2'
moddir = '/etc/apache2/mods-enabled' moddir = '/etc/apache2/mods-enabled'
sitesdir = '/etc/apache2/sites-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' when 'redhat', 'fedora'
vhostdir = '/etc/httpd/vhosts.d' vhostdir = '/etc/httpd/vhosts.d'
logrotatedir = '/etc/logrotate.d/httpd' logrotatedir = '/etc/logrotate.d/httpd'