Dzahn has submitted this change and it was merged. Change subject: icinga,tendril: remove duplicate NameVirtualHost *:80 ......................................................................
icinga,tendril: remove duplicate NameVirtualHost *:80 Removing these lines here because the same line is already in /etc/apache2/ports.conf from the default file as it comes from the distro. And if we have multiple of these, we are getting: "[warn] NameVirtualHost *:80 has no VirtualHosts" on config check / reloads. And, in combination with logrotate, this means cron spam as described on T132661 Both of these are on neon. root@neon:/etc/apache2# grep -r NameVirtual * ports.conf:NameVirtualHost *:80 ports.conf: # If you add NameVirtualHost *:443 here, you will also have to change sites-available/50-tendril-wikimedia-org.conf:NameVirtualHost *:80 sites-available/50-tendril-wikimedia-org.conf:NameVirtualHost *:443 sites-available/50-icinga-wikimedia-org.conf:NameVirtualHost *:80 sites-available/50-icinga-wikimedia-org.conf:NameVirtualHost *:443 sites-available/50-ishmael-wikimedia-org.conf:NameVirtualHost *:80 sites-enabled/50-tendril-wikimedia-org.conf:NameVirtualHost *:80 sites-enabled/50-tendril-wikimedia-org.conf:NameVirtualHost *:443 sites-enabled/50-icinga-wikimedia-org.conf:NameVirtualHost *:80 sites-enabled/50-icinga-wikimedia-org.conf:NameVirtualHost *:443 Bug:T132661 Change-Id: I64681c5af825a975a5f5fcddf3734e0b51cdab97 --- M modules/icinga/templates/icinga.wikimedia.org.erb M modules/tendril/templates/apache/tendril.wikimedia.org.erb 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/icinga/templates/icinga.wikimedia.org.erb b/modules/icinga/templates/icinga.wikimedia.org.erb index 5146a52..4af43b7 100644 --- a/modules/icinga/templates/icinga.wikimedia.org.erb +++ b/modules/icinga/templates/icinga.wikimedia.org.erb @@ -1,6 +1,5 @@ # vim: filetype=apache -NameVirtualHost *:80 NameVirtualHost *:443 AddHandler cgi-script .cgi diff --git a/modules/tendril/templates/apache/tendril.wikimedia.org.erb b/modules/tendril/templates/apache/tendril.wikimedia.org.erb index 767143a..a7c3851 100644 --- a/modules/tendril/templates/apache/tendril.wikimedia.org.erb +++ b/modules/tendril/templates/apache/tendril.wikimedia.org.erb @@ -1,7 +1,6 @@ # vim: filetype=apache # !! this file is managed by puppet !! -NameVirtualHost *:80 NameVirtualHost *:443 <VirtualHost *:443> -- To view, visit https://gerrit.wikimedia.org/r/297727 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64681c5af825a975a5f5fcddf3734e0b51cdab97 Gerrit-PatchSet: 6 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <[email protected]> Gerrit-Reviewer: Alexandros Kosiaris <[email protected]> Gerrit-Reviewer: Dzahn <[email protected]> Gerrit-Reviewer: Elukey <[email protected]> Gerrit-Reviewer: Filippo Giunchedi <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
