Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/61781
Change subject: user_metrics module changes:
......................................................................
user_metrics module changes:
- Fixing git clone
- creating admin account
- seeding MediaWiki db with data good for user_metrics testing.
Change-Id: Iab806d80c2570adaf22cbfbb64c112c11e817c82
---
M puppet/manifests/site.pp
M puppet/modules/user_metrics/manifests/init.pp
2 files changed, 26 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/81/61781/1
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index ef67080..9caacd8 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -34,3 +34,4 @@
class { 'git': }
class { 'memcached': }
class { 'mediawiki': }
+class { 'user_metrics': }
\ No newline at end of file
diff --git a/puppet/modules/user_metrics/manifests/init.pp
b/puppet/modules/user_metrics/manifests/init.pp
index 7df8a2d..6c0b811 100644
--- a/puppet/modules/user_metrics/manifests/init.pp
+++ b/puppet/modules/user_metrics/manifests/init.pp
@@ -41,24 +41,42 @@
ensure => 'installed',
}
- git::clone { 'analytics/E3Analysis':
+ git::clone { 'analytics/user-metrics':
directory => $user_metrics_path,
require => [Package['python-flask']],
}
# create the user_metrics cohorts database
exec { 'user_metrics_mysql_create_database':
- command => "/usr/bin/mysql -pvagrant -e \"CREATE DATABASE
${user_metrics_db_name};\" &&/usr/bin/mysql -pvagrant ${user_metrics_db_name} <
${user_metrics_path}/scripts/user_metrics.sql;",
- unless => "/usr/bin/mysql -pvagrant -e 'SHOW DATABASES' |
/bin/grep -q ${user_metrics_db_name}",
- user => 'root',
+ command => "/usr/bin/mysql -pvagrant -e \"CREATE DATABASE
${user_metrics_db_name};\" && /usr/bin/mysql -pvagrant ${user_metrics_db_name}
< ${user_metrics_path}/scripts/user_metrics.sql;",
+ unless => "/usr/bin/mysql -pvagrant -e 'SHOW DATABASES' |
/bin/grep -q ${user_metrics_db_name}",
+ user => 'root',
logoutput => true,
- require => [Git::Clone['analytics/E3Analysis'],
Service['mysql']]
+ require => [Git::Clone['analytics/user-metrics'],
Service['mysql']]
}
# Need settings.py to configure metrics-api python application
file { "${user_metrics_path}/user_metrics/config/settings.py":
content => template('user_metrics/settings.py.erb'),
- require => Git::Clone['analytics/E3Analysis'],
+ require => Git::Clone['analytics/user-metrics'],
+ }
+
+ # create default admin account
+ exec { 'user_metrics_create_admin_account':
+ command => "/usr/bin/python
${user_metrics_path}/scripts/create_account.py",
+ # Yes, this script loads via relative paths. Sigh...
+ cwd => "${user_metrics_path}/scripts",
+ unless => '/usr/bin/mysql -pvagrant user_metrics -e "select
\'exists\' from api_user where user_name = \'admin\'" | /bin/grep -q exists',
+ require => [Exec['user_metrics_mysql_create_database'],
File["${user_metrics_path}/user_metrics/config/settings.py"]],
+ }
+
+ # Seed the MediaWiki wiki database with data good for testing
user_metrics API.
+ exec { 'user_metrics_mysql_seed_mediawiki_database':
+ command => "/usr/bin/mysql -f -pvagrant wiki <
${user_metrics_path}/scripts/seed.sql;",
+ unless => '/usr/bin/mysql -pvagrant wiki -e "SELECT
\'exists\' FROM page WHERE page_title = \'Hydriz\'" | /bin/grep -q exists',
+ user => 'root',
+ logoutput => true,
+ require => [Git::Clone['analytics/user-metrics'],
Service['mysql']]
}
include apache
@@ -70,6 +88,6 @@
apache::site { $site_name:
content => template("user_metrics/virtual_host.erb"),
- require => [Git::Clone['analytics/E3Analysis'],
Apache::Mod['wsgi'], Apache::Mod['alias']],
+ require => [Git::Clone['analytics/user-metrics'],
Apache::Mod['wsgi'], Apache::Mod['alias']],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/61781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab806d80c2570adaf22cbfbb64c112c11e817c82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
