redmine::apache: Fix duplicated NameVirtualHost directives.

gnubila-france · Jun 25, 2015 · 5b8f70a · 5b8f70a
1 parent b4a2626
commit 5b8f70a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/manifests/apache.pp b/manifests/apache.pp
@@ -51,6 +51,16 @@
        ensure => 'present',
      }
     }
+    # XXX on debian Listen 443 is set in ports.conf, but NameVirtualHost is not
+    if ! defined(File_line['namevirtualhost-443']) {
+      file_line { 'namevirtualhost-443':
+        ensure => 'present',
+        path   => '/etc/apache2/ports.conf',
+        line   => 'NameVirtualHost *:443',
+        match  => '^\s*NameVirtualHost\s*\*:443',
+        notify => Service['apache']
+      }
+    }
     file { $::redmine::ssl_cert:
       ensure  => 'present',
       owner   => 'www-data',

diff --git a/templates/passenger.erb b/templates/passenger.erb
@@ -1,7 +1,5 @@
 # File Managed by Puppet
-NameVirtualHost <%= @ip_addr %>:80
 <% if scope.lookupvar('redmine::ssl') %>
-NameVirtualHost <%= @ip_addr %>:443
 <VirtualHost <%= @ip_addr %>:80>
   ServerName <%= @server_name %>
   <%- if @serveraliases != "" -%>