BryanDavis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402606 )
Change subject: wikimetrics: remove role ...................................................................... wikimetrics: remove role Remove the wikimetrics role and related Puppet module. This module was removed from Wikimedia's operations/puppet.git repo in its f79b155 revision. The code present here has not been updated for systemd, which means that it does not work on the current Debian Jessie master branch of MediaWiki-Vagrant or the Debian Stretch testing branch. Bug: T184154 Change-Id: I5d315c0f0b6be94b5559f0d1afe21704104b1ce1 --- M .gitmodules M .rubocop.yml M puppet/hieradata/common.yaml D puppet/modules/role/manifests/wikimetrics.pp D puppet/modules/wikimetrics 5 files changed, 0 insertions(+), 116 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/06/402606/1 diff --git a/.gitmodules b/.gitmodules index 5b6ae2b..117e3b4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "puppet/modules/wikimetrics"] - path = puppet/modules/wikimetrics - url = https://gerrit.wikimedia.org/r/operations/puppet/wikimetrics [submodule "puppet/modules/nginx"] path = puppet/modules/nginx url = https://gerrit.wikimedia.org/r/operations/puppet/nginx diff --git a/.rubocop.yml b/.rubocop.yml index e8367dd..6ff92d4 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -11,7 +11,6 @@ - 'puppet/modules/cdh/**/*' - 'puppet/modules/nginx/**/*' - 'puppet/modules/stdlib/**/*' - - 'puppet/modules/wikimetrics/**/*' - 'puppet/modules/wmflib/**/*' - 'srv/**/*' - 'tmp/**/*' diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index fabf5cf..81ee666 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -441,8 +441,6 @@ role::wikidata::main_page: "Wiki:Main Page" -role::wikimetrics::dir: "%{hiera('mwv::services_dir')}/wikimetrics" - scholarships::vhost_name: "scholarships%{hiera('mwv::tld')}" scholarships::db_name: scholarships scholarships::db_user: scholarships diff --git a/puppet/modules/role/manifests/wikimetrics.pp b/puppet/modules/role/manifests/wikimetrics.pp deleted file mode 100644 index ce261f2..0000000 --- a/puppet/modules/role/manifests/wikimetrics.pp +++ /dev/null @@ -1,109 +0,0 @@ -# == Class: role::wikimetrics -# Wikimetrics is a Wikimedia Foundation developed tool that provides -# access to the Wikimedia API. It allows users to pull data about a -# group of usernames (called cohorts) to discover retention rates for -# those users, how many characters they have added, how many edits they -# have made, how many pages they have created, etc, all within time -# periods the Wikimetrics user sets. -# -# This role installs and hosts Wikimetrics at http://localhost:5000. -# (both the guest and host) -# -# NOTE! You will need the wikimetrics git submodule available. -# Run this command on your local machine make sure modules/wikimetrics -# is cloned and up to date: -# -# git submodule update --init -# -class role::wikimetrics( - $dir, -) { - require ::role::mediawiki - require ::role::centralauth - require ::mysql::packages - - require_package('python-nose') - - # Should Wikimetrics run under Apache or using the development server? - # Legal values are 'daemon' and 'apache'. - $web_server_mode = 'daemon' - - # Make wikimetrics group 'www-data' if running in apache mode. - # This allows for apache to write files to wikimetrics var directories - $wikimetrics_group = $web_server_mode ? { - 'apache' => 'www-data', - default => 'wikimetrics', - } - - class { '::wikimetrics': - path => $dir, - group => $wikimetrics_group, - # Use the role::mediawiki MySQL database for - # wikimetrics editor cohort analysis - db_user_mediawiki => $::mediawiki::multiwiki::db_user, - db_pass_mediawiki => $::mediawiki::multiwiki::db_pass, - db_name_mediawiki => $::mediawiki::db_name, - db_host_mediawiki => 'localhost', - # Use the role::centralauth MySQL database for - # wikimetrics cohort user expansion - db_user_centralauth => $::mediawiki::multiwiki::db_user, - db_pass_centralauth => $::mediawiki::multiwiki::db_pass, - db_name_centralauth => $::role::centralauth::shared_db, - db_host_centralauth => 'localhost', - # clone wikimetrics as vagrant share user - # so that it works properly in the shared - # /vagrant directory - repository_owner => $::share_owner, - # wikimetrics runs on the LabsDB usually, - # where this table is called 'revision_userindex'. - # The mediawiki database usually calls this 'revision'. - revision_tablename => 'revision', - archive_tablename => 'archive', - # Since we are using the /vagrant shared directory for configs, - # make sure puppet doesn't try to change the ownership every time - # it runs. - config_file_owner => $::share_owner, - config_file_group => $::share_group, - # make upstart managed services start after - # /vagrant shared directory is mounted. - service_start_on => 'vagrant-mounted', - } - - # Run the wikimetrics/scripts/install script - # in order to pip install proper dependencies. - # Note: This is not in the wikimetrics puppet module - # because it is an improper way to do things in - # WMF production. - exec { 'install_wikimetrics_dependencies': - command => "${dir}/scripts/install ${dir}", - creates => '/usr/local/bin/wikimetrics', - path => '/usr/local/bin:/usr/bin:/bin', - user => 'root', - require => Class['::wikimetrics'], - } - - class { '::wikimetrics::database': - db_root_pass => $::mysql::root_password, - wikimetrics_path => $dir, - require => Exec['install_wikimetrics_dependencies'], - } - - class { '::wikimetrics::queue': - require => [ - Exec['install_wikimetrics_dependencies'], - # role::mediawiki installs redis, and queue needs this. - Class['role::mediawiki'], - ] - } - - class { '::wikimetrics::scheduler': - require => Exec['install_wikimetrics_dependencies'], - } - - # make sure wsgi is included in case we are running in apache WSGI mode. - include ::apache::mod::wsgi - class { 'wikimetrics::web': - mode => $web_server_mode, - require => Exec['install_wikimetrics_dependencies'], - } -} diff --git a/puppet/modules/wikimetrics b/puppet/modules/wikimetrics deleted file mode 160000 index 5f416bb..0000000 --- a/puppet/modules/wikimetrics +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5f416bbce4188914f48a044a8df09f1c34b07183 -- To view, visit https://gerrit.wikimedia.org/r/402606 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5d315c0f0b6be94b5559f0d1afe21704104b1ce1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: stretch-migration Gerrit-Owner: BryanDavis <bda...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
