Commit Graph

19 Commits

Author SHA1 Message Date
Nils Kalchhauser
fa291e289a fix line feed suppression in standard.tmpl 2016-04-10 22:17:44 +02:00
Daniel Hobley
9b8932b267 Fixed a bug where the Require parameter would be on the same line as location
- This is then ignored by Apache
2016-02-18 16:24:35 +01:00
a.genus
ba6679ef66 Remove breaking changes 2016-02-01 19:01:02 +03:00
Christian McHugh
f8d90931f8 Cleanup whitespace in generated vhosts
Correct handling of allow encoded slashes
2016-01-31 16:35:29 -06:00
David Douard
f01c72c637 Allow to configure several interfaces for a vhost.
This is done by split the interface pillar value instead of using a proper
list so it behaves exactly the same as before for simple 1 interface cases
(no need to refactor one's pillar files).

The resulting is something like:

  Listen 1.2.3.4:80
  Listen [2001🔤def💯:3]:80

  <VirtualHost 1.2.3.4:80 [2001🔤def💯:3]:80>
  ...
2016-01-25 12:25:29 +01:00
Rowcliffe Browne
4987f3d556 allow AllowEncodedSlashes directive in vhosts.
Apache2 docs state this is global, but vhost overrides it even when not specified.

additionally, this directive is defaulted differently across distributions (eg. CentOS is default 'On')

this change allows control of the directive.
2016-01-20 12:17:41 +08:00
a.genus
cac7545070 Add listen directive to vhosts templates and remove ports.conf 2015-12-24 16:01:32 +03:00
root
3742b40f86 Added support for Alias and Locations, as well as enabling Dav 2015-12-10 06:59:32 +10:00
Jonathan Ballet
a8f2d89995 ssl: also support the SSLCertificateChainFile required by some providers 2015-06-09 11:54:07 +02:00
Mosen
d4b1af0af4 Fix unnecessary comparison against boolean in vhosts/standard.tmpl 2015-05-14 16:55:11 +10:00
Mosen
f135e2e0d5 Fix incorrect syntax in pillar example for SSLCertificateFile, SSLCertificateKeyFile
Fix check for SSLCertificateFile, SSLCertificateKeyFile variables in vhosts/standard.tmpl, now using dict.get()
2015-05-14 12:38:27 +10:00
Florian Bittner
dbb86f2bc4 Add basic SSL functionality. 2015-04-02 14:23:21 +02:00
Adrien Bréfort
3612927174 Fix default Options. 2014-10-28 18:50:04 +01:00
Adrien Bréfort
67e12a8bc2 Fixed Apache 2.4 support and added support for Ubuntu 14.10.
Replace require_all with use_require in map.jinja, we want to be able
to use custom Require values.

Remove uneeded Directory in standard.tmpl and add conditional and
default value for Require.

Fix bad filenames in standard.sls
2014-10-28 15:13:13 +01:00
Berry Langerak
b8fe242d35 Adding support for Apache 2.4 on Ubuntu 14.04
- Adding confext to virtualhost names.
- Renaming the default config file for Ubuntu (000-default.conf).
- Adding ability to use "Require all granted".
2014-10-01 10:35:53 +02:00
Jorge Rodriguez
845b58d15f CustomLog directive takes two parameters. Introduced LogFormat variable and defaulted to "common" format. 2013-11-29 10:19:16 +02:00
Alan McNea
e34c476ea1 Added DirectoryIndex, UseCanonicalName, and VirtualDocumentRoot properties to standard.tmpl 2013-11-05 19:32:49 +00:00
Alan McNea
b51e442440 Fixed bugs in standard.tmpl 2013-11-05 19:32:03 +00:00
Seth House
2499a50135 Added apache.vhost formula 2013-08-29 02:10:23 -06:00