From 4fa9d57d2b81adb32360e9eb94c4f9ce3fb3dad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Tue, 21 Jun 2016 17:39:35 +0200 Subject: [PATCH] Do not force usage of apache.config in apache.vhosts.standard In 4d04d95b02df334c5e33e06e9dca139a223441f0 (#113) apache/vhosts/standard.sls has been modified by @genuss to include apache.config on the basis that apache.config was now able to retrieve the interfaces/ports from pillar data in apache:sites. I use apache:sites to register virtual hosts with non-standard "template_file" (they contain the desired configuration directly) and the "interface/port" keys are thus not meaningful. apache: sites: example.com: template_file: salt://vm/example/apache-vhost.conf DocumentRoot: False The generated ports.conf ends up containing only "*:80" while my virtual host configuration files need ports 80 and 443. The situation was perfectly fine up to now because the default configuration file handles both of those ports if you have mod_ssl installed. People who want to use apache.config should just explicitly include that state, we should not force its usage to all apache.vhosts.standard users. --- apache/vhosts/standard.sls | 1 - 1 file changed, 1 deletion(-) diff --git a/apache/vhosts/standard.sls b/apache/vhosts/standard.sls index f0db05d..5ccd137 100644 --- a/apache/vhosts/standard.sls +++ b/apache/vhosts/standard.sls @@ -2,7 +2,6 @@ include: - apache - - apache.config {% for id, site in salt['pillar.get']('apache:sites', {}).items() %} {% set documentroot = site.get('DocumentRoot', '{0}/{1}'.format(apache.wwwdir, id)) %}