Dzahn has submitted this change and it was merged.

Change subject: stats.wm - have an apache/ports.conf with NameVirtualHost *:443 
to avoid '_default_ virtualhost overlap on port 443'
......................................................................


stats.wm - have an apache/ports.conf with NameVirtualHost *:443
to avoid '_default_ virtualhost overlap on port 443'

Change-Id: I817a88b4c9f27870e45b0499b0ebeaff418bd7a7
---
M manifests/misc/statistics.pp
1 file changed, 7 insertions(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index 73e11a6..70dd96a 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -263,12 +263,18 @@
   install_certificate{ $site_name: }
 
   file {
-       "/etc/apache2/sites-available/stats.wikimedia.org":
+       '/etc/apache2/sites-available/stats.wikimedia.org':
                ensure => present,
                mode => '0444',
                owner => root,
                group => root,
                content => template('apache/sites/stats.wikimedia.org.erb');
+       '/etc/apache2/ports.conf':
+               ensure  => present,
+               mode    => '0644',
+               owner   => root,
+               group   => root,
+               source  => 'puppet:///files/apache/ports.conf.ssl';
        }
 
   apache_site { statswikimedia: name => 'stats.wikimedia.org' }

-- 
To view, visit https://gerrit.wikimedia.org/r/85973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I817a88b4c9f27870e45b0499b0ebeaff418bd7a7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to