diff options
| author | Michael Scherer <misc@mageia.org> | 2011-02-01 12:44:50 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-02-01 12:44:50 +0000 |
| commit | 0504e572eec2cc6e23b43c21d84efbe21b323faa (patch) | |
| tree | 900ec2202e17ef5edab6dba1e64ffa541ed1d4d6 /modules/apache/templates/vhost_catalyst_app.conf | |
| parent | f4788d42dda16c6bdc99c76e9969ad59f2e1bb88 (diff) | |
| download | puppet-0504e572eec2cc6e23b43c21d84efbe21b323faa.tar puppet-0504e572eec2cc6e23b43c21d84efbe21b323faa.tar.gz puppet-0504e572eec2cc6e23b43c21d84efbe21b323faa.tar.bz2 puppet-0504e572eec2cc6e23b43c21d84efbe21b323faa.tar.xz puppet-0504e572eec2cc6e23b43c21d84efbe21b323faa.zip | |
- refactoring of apache config file, to ease future deployment
Diffstat (limited to 'modules/apache/templates/vhost_catalyst_app.conf')
| -rw-r--r-- | modules/apache/templates/vhost_catalyst_app.conf | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/modules/apache/templates/vhost_catalyst_app.conf b/modules/apache/templates/vhost_catalyst_app.conf index ca0aca68..eaa652d7 100644 --- a/modules/apache/templates/vhost_catalyst_app.conf +++ b/modules/apache/templates/vhost_catalyst_app.conf @@ -1,28 +1,5 @@ -<% if use_ssl then - port = 443 -else - port = 80 -end -%> - -<VirtualHost *:<%= port %>> -<% if use_ssl then %> - SSLEngine on - SSLCertificateFile /etc/ssl/apache/<%= name %>.pem - SSLCertificateKeyFile /etc/ssl/apache/<%= name %>.pem -<% end %> - ServerName <%= name %> - # Serve static content directly - DocumentRoot /dev/null - -<% if location != '' then %> - Alias /static <%= location %>/root/static -<% end %> - Alias / <%= script %>/ - FastCgiServer <%= script %> -processes <%= process %> -idle-timeout 30 - - <Location /> - Allow from all - </Location> -</VirtualHost> - +<%- if location != '' then -%> +Alias /static <%= location %>/root/static +<%- end -%> +Alias / <%= script %>/ +FastCgiServer <%= script %> -processes <%= process %> -idle-timeout 30 |