Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Remove files/apache/ports.conf and files/apache/ports.conf.ssl
......................................................................
Remove files/apache/ports.conf and files/apache/ports.conf.ssl
files/apache/ports.conf and files/apache/ports.conf.ssl were added in
f9df52dc4b64868c7f52fb12f2a05a4b0cc1b483 and
92ce13bfab6abe12bbc78bdcf46e17d2c8045e3e, respectively. They are not
used.
Change-Id: Ic83fc104ef1872f93b8bf586b7b2c8a4c2e65c49
---
D files/apache/ports.conf
D files/apache/ports.conf.ssl
2 files changed, 0 insertions(+), 37 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
Dzahn: Looks good to me, but someone else must approve
diff --git a/files/apache/ports.conf b/files/apache/ports.conf
deleted file mode 100644
index 99421c5..0000000
--- a/files/apache/ports.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# !This file is managed by Puppet!
-# this is a default Debian/Ubuntu ports.conf _besides_ NameVirtualHost *:80
being commented
-# it avoids "NameVirtualHost *:80 has no VirtualHosts"-warnings because of a
duplicate definition when using "apache_confd { namevirtualhost.." with puppet
-
-# If you just change the port or add more ports here, you will likely also
-# have to change the VirtualHost statement in
-# /etc/apache2/sites-enabled/000-default
-# This is also true if you have upgraded from before 2.2.9-3 (i.e. from
-# Debian etch). See /usr/share/doc/apache2.2-common/NEWS.Debian.gz and
-# README.Debian.gz
-
-# NameVirtualHost *:80
-Listen 80
-
-<IfModule mod_ssl.c>
- # If you add NameVirtualHost *:443 here, you will also have to change
- # the VirtualHost statement in /etc/apache2/sites-available/default-ssl
- # to <VirtualHost *:443>
- # Server Name Indication for SSL named virtual hosts is currently not
- # supported by MSIE on Windows XP.
- Listen 443
-</IfModule>
-
-<IfModule mod_gnutls.c>
- Listen 443
-</IfModule>
-
diff --git a/files/apache/ports.conf.ssl b/files/apache/ports.conf.ssl
deleted file mode 100644
index 25a0d02..0000000
--- a/files/apache/ports.conf.ssl
+++ /dev/null
@@ -1,10 +0,0 @@
-# ! this file is managed by puppet !
-# simple Apache ports.conf with enabled SSL (NameVirtualHost *:443)
-
-NameVirtualHost *:80
-Listen 80
-
-<IfModule mod_ssl.c>
- NameVirtualHost *:443
- Listen 443
-</IfModule>
--
To view, visit https://gerrit.wikimedia.org/r/325457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic83fc104ef1872f93b8bf586b7b2c8a4c2e65c49
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@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
