apache-formula/apache
Raphaël Hertzog 4fa9d57d2b Do not force usage of apache.config in apache.vhosts.standard
In 4d04d95b02 (#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.
2016-06-21 17:39:35 +02:00
..
files Add custom port to RedHat config 2016-05-17 18:59:01 +02:00
vhosts Do not force usage of apache.config in apache.vhosts.standard 2016-06-21 17:39:35 +02:00
config.sls Add support for Ubuntu precise 2016-04-13 13:32:42 +02:00
debian_full.sls Remove breaking changes 2016-02-01 19:01:02 +03:00
init.sls fixed things seth mentioned in class 2014-09-25 11:48:36 -05:00
logrotate.sls Improove the logrotate state with the map 2016-01-07 19:02:00 +00:00
manage_security.sls Added newlines to recent files 2015-12-16 16:43:16 +03:00
map.jinja Add mod_security management 2016-05-11 15:41:07 -03:00
mod_actions.sls Improved apache-formula 2015-06-19 20:44:53 +02:00
mod_dav_svn.sls Add mod_dav_svn 2015-12-23 17:02:24 +03:00
mod_fcgid.sls Improved apache-formula 2015-06-19 20:44:53 +02:00
mod_headers.sls Improved apache-formula 2015-06-19 20:44:53 +02:00
mod_mpm.sls fix apache-restart ID in apache/mod_mpm according to apache/init.sls 2015-08-25 01:42:08 -04:00
mod_pagespeed.sls Fixed directory typo for logrotate 2016-04-11 15:54:04 +01:00
mod_php5.sls Improved apache-formula 2015-06-19 20:44:53 +02:00
mod_proxy_http.sls Removed apt from items where it is not required, also modified fcgid to include apache as it requires the apache package. 2014-01-20 20:47:04 +00:00
mod_proxy.sls Fixing minor typo 2015-11-23 13:39:28 -05:00
mod_remoteip.sls Added ability to configure mod_remoteip 2015-12-16 02:54:14 +03:00
mod_rewrite.sls Improved apache-formula 2015-06-19 20:44:53 +02:00
mod_security.sls Add mod_security management 2016-05-11 15:41:07 -03:00
mod_ssl.sls enable mod_ssl on Redhat 2016-05-18 10:07:24 +02:00
mod_vhost_alias.sls Improved apache-formula 2015-06-19 20:44:53 +02:00
mod_wsgi.sls fixed things seth mentioned in class 2014-09-25 11:48:36 -05:00
modsecurity.yaml Add mod_security management 2016-05-11 15:41:07 -03:00
modules.sls Add '-f' option to a2dismod to fix hanging minions for some modules (#143) 2016-05-23 23:49:03 -07:00
no_default_vhost.sls use default style for cmd.run: instead of cmd: - run 2016-05-18 17:08:22 +02:00
osfingermap.yaml Add support for Ubuntu precise 2016-04-13 13:32:42 +02:00
own_default_vhost.sls Added newlines to recent files 2015-12-16 16:43:16 +03:00
register_site.sls Replace deprecated iteritems() with items() 2015-11-22 18:57:56 -03:00