diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-08-02 12:18:13 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-08-02 12:18:13 -0300 |
| commit | d8b13a863d928e3a8a46b05396ba7a5ae5a52829 (patch) | |
| tree | e6e29ac1151b2fd60ac072b780f7d31bc70fcc41 /manifests | |
| parent | 0e9cd07371336f5f7aa620fa7a996daeb7f79480 (diff) | |
| download | puppet-apache-d8b13a863d928e3a8a46b05396ba7a5ae5a52829.tar.gz puppet-apache-d8b13a863d928e3a8a46b05396ba7a5ae5a52829.tar.bz2 | |
Switch to default.conf vhost
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index d4ea486..2960e2f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -157,8 +157,14 @@ class apache( "puppet:///modules/apache/icons", ] } + # Legacy configuration + file { [ "${sites}-available/default", "${sites}-enabled/000-default" ]: + ensure => absent, + notify => Service["apache"], + } + # default site configuration - file { "${sites}-available/default": + file { "${sites}-available/default.conf": ensure => present, content => template('apache/default.erb'), owner => root, @@ -167,6 +173,13 @@ class apache( notify => Service["apache"], } + file { "${sites}-enabled/000-default.conf": + owner => root, + group => root, + ensure => "${sites}-available/default.conf", + notify => Service["apache"], + } + # https proxy configuration # see http://www.metaltoad.com/blog/running-drupal-secure-pages-behind-proxy file { "$conf_d/https-proxy": |