Browse Source

Remove breaking changes

tags/v0.37.4
a.genus 9 years ago
parent
commit
ba6679ef66
5 changed files with 7 additions and 17 deletions
  1. +0
    -5
      apache/debian_full.sls
  2. +7
    -0
      apache/files/Debian/apache-2.4.config.jinja
  3. +0
    -4
      apache/vhosts/proxy.tmpl
  4. +0
    -4
      apache/vhosts/redirect.tmpl
  5. +0
    -4
      apache/vhosts/standard.tmpl

+ 0
- 5
apache/debian_full.sls View File

- require: - require:
- pkg: apache - pkg: apache


/etc/apache2/ports.conf:
file.absent:
- require:
- pkg: apache

{% endif %} #END: os = debian {% endif %} #END: os = debian

+ 7
- 0
apache/files/Debian/apache-2.4.config.jinja View File

# together by including all remaining configuration files when starting up the # together by including all remaining configuration files when starting up the
# web server. # web server.
# #
# * ports.conf is always included from the main configuration file. It is
# supposed to determine listening ports for incoming connections which can be
# customized anytime.
#
# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/ # * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
# directories contain particular configuration snippets which manage modules, # directories contain particular configuration snippets which manage modules,
# global configuration fragments, or virtual host configurations, # global configuration fragments, or virtual host configurations,
IncludeOptional mods-enabled/*.load IncludeOptional mods-enabled/*.load
IncludeOptional mods-enabled/*.conf IncludeOptional mods-enabled/*.conf


# Include list of ports to listen on
Include ports.conf



# Sets the default security model of the Apache2 HTTPD server. It does # Sets the default security model of the Apache2 HTTPD server. It does
# not allow access to the root filesystem outside of /usr/share and /var/www. # not allow access to the root filesystem outside of /usr/share and /var/www.

+ 0
- 4
apache/vhosts/proxy.tmpl View File

'ProxyRoute': site.get('ProxyRoute', {}), 'ProxyRoute': site.get('ProxyRoute', {}),
} %} } %}


{% for intf in vals.interfaces -%}
Listen {{ intf }}:{{ vals.port }}
{% endfor %}

<VirtualHost {%- for intf in vals.interfaces %} {{intf}}:{{ vals.port }}{% endfor -%}> <VirtualHost {%- for intf in vals.interfaces %} {{intf}}:{{ vals.port }}{% endfor -%}>
ServerName {{ vals.ServerName }} ServerName {{ vals.ServerName }}
{% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %} {% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %}

+ 0
- 4
apache/vhosts/redirect.tmpl View File



} %} } %}


{% for intf in vals.interfaces -%}
Listen {{ intf }}:{{ vals.port }}
{% endfor %}

<VirtualHost {%- for intf in vals.interfaces %} {{intf}}:{{ vals.port }}{% endfor -%}> <VirtualHost {%- for intf in vals.interfaces %} {{intf}}:{{ vals.port }}{% endfor -%}>
ServerName {{ vals.ServerName }} ServerName {{ vals.ServerName }}
{% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %} {% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %}

+ 0
- 4
apache/vhosts/standard.tmpl View File

}, },
} -%} } -%}


{% for intf in vals.interfaces -%}
Listen {{ intf }}:{{ vals.port }}
{% endfor %}

<VirtualHost {% for intf in vals.interfaces %} {{intf}}:{{ vals.port }}{% endfor -%}> <VirtualHost {% for intf in vals.interfaces %} {{intf}}:{{ vals.port }}{% endfor -%}>
ServerName {{ vals.ServerName }} ServerName {{ vals.ServerName }}
{% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %} {% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %}

Loading…
Cancel
Save