Dzahn has submitted this change and it was merged.

Change subject: wikimania scholarships: remove namevirtualhost file
......................................................................


wikimania scholarships: remove namevirtualhost file

There is no need for this to listen on 443 anymore, it is behind misc-web
and it only causes errors when applied on a host with Apache 2.4 anyways
since there is no more "conf.d" directory.

Bug:T105920
Change-Id: Ia1819e013f126f0322065696128d59d16268f2fa
---
M modules/wikimania_scholarships/manifests/init.pp
1 file changed, 2 insertions(+), 5 deletions(-)

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



diff --git a/modules/wikimania_scholarships/manifests/init.pp 
b/modules/wikimania_scholarships/manifests/init.pp
index 0845a8b..82581a8 100644
--- a/modules/wikimania_scholarships/manifests/init.pp
+++ b/modules/wikimania_scholarships/manifests/init.pp
@@ -73,10 +73,7 @@
     include ::apache::mod::rewrite
     include ::apache::mod::headers
 
-    file { '/etc/apache2/conf.d/namevirtualhost':
-        source => 'puppet:///files/apache/conf.d/namevirtualhost',
-        mode   => '0444',
-        notify => Service['apache2'],
-    }
 }
+
+
 # vim:sw=4 ts=4 sts=4 et:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1819e013f126f0322065696128d59d16268f2fa
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to