Commit Graph

32 Commits

Author SHA1 Message Date
Mathieu Tarral
c195dce07c add an 'enabled' attribute for a site in pillar 2015-08-25 01:50:58 -04:00
Rico Moorman
1a2d22b2e8 Correct variable name 2015-06-19 22:55:30 +02:00
Niels Abspoel
f6a0c84544 Merge pull request #56 from thornycrackers/master
Create defaul vhost directories when DocumentRoot is not set
2015-06-17 16:11:29 +02:00
Jonathan Ballet
a8f2d89995 ssl: also support the SSLCertificateChainFile required by some providers 2015-06-09 11:54:07 +02:00
Jonathan Ballet
c9d9d954de proxy: support SSL certificate in the proxy template 2015-06-09 11:48:35 +02:00
Cody Hiar
07b2a9f9f5 Create defaul vhost directories when DocumentRoot is not set 2015-05-31 12:17:25 -06: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
Forrest
99ea682cfb Merge pull request #52 from daschatten/master
Add basic SSL functionality.
2015-04-02 08:52:42 -07:00
Florian Bittner
dbb86f2bc4 Add basic SSL functionality. 2015-04-02 14:23:21 +02:00
Forrest
39176444d1 Merge pull request #48 from multani/fix-jinja-reverse
Fix Jinja's reverse
2015-03-25 19:25:38 -07:00
Jonathan Ballet
42426f3f4a Don't fail on missing DocumentRoot
If the DocumentRoot value wasn't set, applying the state would cause the
following error:

          ID: site.example.com-documentroot
    Function: file.directory
        Name: None
      Result: False
     Comment: Specified file None is not an absolute path
     Started: 15:07:05.596723
    Duration: 4.929 ms
     Changes:

This fixes the problem by not trying to check for the DocumentRoot directory is
the value is missing.
2015-03-25 15:06:18 +01:00
Jonathan Ballet
74e4c4d7d5 Make proxies order stable 2015-03-25 14:48:13 +01:00
Jonathan Ballet
3f4a7667f7 Jinja's reverse is a filter, use it accordingly 2015-03-25 14:47:55 +01:00
Cody Hiar
f1b89abd3b Update standard.sls
Make sure that you can makedirs incase parent folders are not created
2015-03-23 16:53:45 -06:00
Cody Hiar
138a522f3f Update standard.sls
Create the vhost DocumentRoot directory if it does not exist
2015-03-23 15:22:08 -06:00
sebastien.fleury
fce8d72c12 Issue#41 configure multi proxypass configuration in vhost 2015-03-11 18:35:41 +01:00
root
2ba72e613d Add new templates 'proxy.tmpl' and 'redirect.tmpl'. Add comment pointing to new templates to pillar.example. 2015-02-15 00:06:44 +01: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
Vincent Fretin
0aec048eaf use test -f instead of ls 2014-08-01 15:32:40 +02:00
vincentfretin
18d8c0c0fb Don't execute a2ensite if the vhost is already enabled 2014-08-01 10:43:04 +02:00
Adam Herzog
be1aa5629e Use confext parameter when naming vhost config files. 2014-02-09 09:12:31 -05:00
Arnold Bechtoldt
1fce705bc0 setting the remaining changes caused by the change of cmd.wait to .module.wait in init.sls 2014-01-04 23:46:47 +01:00
Michal Galet
a3299dc1eb States for apache-reload and apache-restart using module.wait not working 2014-01-04 11:59:39 +00: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
c863598ec7 Moved apache-reload and apache-restart commands to init.sls and invoke apache-reload from standard.sls 2013-11-05 19:34:06 +00: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
f1cff2dd22 Renamed package-map.jinja to map.jinja; is used for more than package names 2013-09-03 13:28:00 -06:00
Seth House
2499a50135 Added apache.vhost formula 2013-08-29 02:10:23 -06:00