Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362118 )
Change subject: Clone wikistats v2 repository and link it to v2
......................................................................
Clone wikistats v2 repository and link it to v2
This sets up wikistats v2 to serve at stats.wikimedia.org/v2
Bug: T167684
Change-Id: I6cff8fcf70a91a922f9c37ba3b5f48dee2bd7835
---
M modules/statistics/manifests/sites/stats.pp
1 file changed, 39 insertions(+), 1 deletion(-)
Approvals:
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/statistics/manifests/sites/stats.pp
b/modules/statistics/manifests/sites/stats.pp
index 64366ab..66a4595 100644
--- a/modules/statistics/manifests/sites/stats.pp
+++ b/modules/statistics/manifests/sites/stats.pp
@@ -11,7 +11,11 @@
}
require ::geowiki::private_data
- $geowiki_private_directory =
'/srv/stats.wikimedia.org/htdocs/geowiki-private'
+ $wikistats_web_directory = '/srv/stats.wikimedia.org'
+ $wikistats_v2_link = "${wikistats_web_directory}/v2"
+ $source_directory = '/srv/src'
+ $wikistats_source_directory = '/srv/src/wikistats-v2'
+ $geowiki_private_directory =
"${wikistats_web_directory}/htdocs/geowiki-private"
$geowiki_private_htpasswd_file = '/etc/apache2/htpasswd.stats-geowiki'
# add htpasswd file for stats.wikimedia.org
@@ -42,4 +46,38 @@
apache::site { 'stats.wikimedia.org':
content => template('statistics/stats.wikimedia.org.erb'),
}
+
+ file { $source_directory:
+ ensure => directory,
+ owner => 'root',
+ group => 'www-data',
+ mode => '0755',
+ }
+
+ file { $wikistats_source_directory:
+ ensure => directory,
+ owner => 'root',
+ group => 'www-data',
+ mode => '0755',
+ require => File[$source_directory],
+ }
+
+ # stats.wikimedia.org/v2 (Wikistats 2.0) setup:
+ # 1) wikistats v2 is cloned and has a built version available in /dist
+ git::clone { 'wikistats-v2':
+ ensure => 'latest',
+ directory => $wikistats_source_directory,
+ branch => 'master',
+ origin => 'https://phabricator.wikimedia.org/source/wikistats.git',
+ owner => 'root',
+ group => 'www-data',
+ mode => '0755',
+ require => File[$wikistats_source_directory],
+ }
+
+ # 2) it is then linked to serve at http://stats.wikimedia.org/v2
+ file { $wikistats_v2_link:
+ ensure => 'link',
+ target => "${wikistats_source_directory}/dist",
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/362118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6cff8fcf70a91a922f9c37ba3b5f48dee2bd7835
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Milimetric <dandree...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Nuria <nu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
