Ori.livneh has submitted this change and it was merged.
Change subject: misc::statistics::sites::default: use apache::site, not
apache::vhost
......................................................................
misc::statistics::sites::default: use apache::site, not apache::vhost
apache::vhost is deprecated; this and phabricator are the remaining users.
(There's a patch for removing the deployment one in labs).
Port it to apache::site by copying the actual generated apache config file from
stat1001 over to files/apache/sites. I didn't modify it except to remove the
(now-inaccurate) comment header and to tidy up whitespace.
Change-Id: I7ee16003845024ab1600687732a0651c17e380c7
---
A files/apache/sites/stat1001.wikimedia.org
M manifests/misc/statistics.pp
2 files changed, 20 insertions(+), 5 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
Ottomata: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/files/apache/sites/stat1001.wikimedia.org
b/files/apache/sites/stat1001.wikimedia.org
new file mode 100644
index 0000000..5a5107a
--- /dev/null
+++ b/files/apache/sites/stat1001.wikimedia.org
@@ -0,0 +1,18 @@
+NameVirtualHost *:80
+<VirtualHost *:80>
+ ServerName stat1001.wikimedia.org
+
+ DocumentRoot /var/www
+
+ <Directory /var/www>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
+
+ LogLevel warn
+ ErrorLog /var/log/apache2/default_error.log
+ CustomLog /var/log/apache2/default_access.log combined
+ ServerSignature Off
+</VirtualHost>
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index d6e331c..ee2f4f4 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -397,11 +397,8 @@
# == Class misc::statistics::sites::default
# Serves files from /var/www on this node's $fqdn.
class misc::statistics::sites::default {
- apache::vhost { 'default':
- servername => $::fqdn,
- port => '80',
- docroot => '/var/www',
- ssl => false,
+ apache::site { 'default':
+ source => 'puppet:///files/apache/sites/stat1001.wikimedia.org',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/143075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ee16003845024ab1600687732a0651c17e380c7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
