diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2009-12-23 16:06:45 -0500 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2009-12-23 16:06:45 -0500 |
| commit | d2c4bdf792815f0a0f54d717bdec619f03d984ab (patch) | |
| tree | b80bd6aa94eda96089ebb005763f9f39eb71d76c /templates/vhosts/php_drupal | |
| parent | 9513cf4a201d0e7148aa5f0db490a29a02611b19 (diff) | |
introduce config::global for global configs in conf.d and config::include for vhost snippets in include.d
Diffstat (limited to 'templates/vhosts/php_drupal')
| -rw-r--r-- | templates/vhosts/php_drupal/php_drupal.erb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/vhosts/php_drupal/php_drupal.erb b/templates/vhosts/php_drupal/php_drupal.erb index 6c106ce..9d54940 100644 --- a/templates/vhosts/php_drupal/php_drupal.erb +++ b/templates/vhosts/php_drupal/php_drupal.erb @@ -1,7 +1,7 @@ # <%= servername %> <%- unless ssl_mode.to_s == 'only' then -%> <VirtualHost *:80> - Include conf.d/defaults.inc + Include include.d/defaults.inc ServerName <%= servername %> <%- unless serveralias.to_s.empty? then -%> @@ -98,8 +98,8 @@ <%- unless ssl_mode.to_s == 'false' then -%> <VirtualHost *:443> - Include conf.d/defaults.inc - Include conf.d/ssl_defaults.inc + Include include.d/defaults.inc + Include include.d/ssl_defaults.inc ServerName <%= servername %> <%- unless serveralias.to_s.empty? then -%> |