Dduvall has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200624
Change subject: Install non-vendor services to /vagrant/srv
......................................................................
Install non-vendor services to /vagrant/srv
MediaWiki-related and other actively developed services should be
installed to a location that's accessible on the host system.
Vendor services will remain in /srv to avoid the permissions and
performance issues that come with NFS/vboxsf.
Bug: T89919
Change-Id: I769c8da0509c8cd6d30955fe18228b19ffa9d216
---
M puppet/hieradata/common.yaml
1 file changed, 19 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/24/200624/1
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index a50382d..9bda957 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -3,6 +3,10 @@
- '::role::mediawiki'
- '::puppet::agent'
+files_dir: /srv
+services_dir: /vagrant/srv
+vendor_dir: /srv
+
apache::docroot: /var/www
arcanist::deploy_dir: /vagrant/phab
@@ -12,7 +16,7 @@
cdh::oozie::server::db_root_password: "%{hiera('mysql::root_password')}"
cdh::oozie::server::heapsize: 64
-crm::dir: /srv/org.wikimedia.civicrm
+crm::dir: "%{hiera('services_dir')}/org.wikimedia.civicrm"
crm::site_name: crm.dev
crm::drupal_db: drupal
crm::civicrm_db: civicrm
@@ -20,7 +24,7 @@
crm::db_pass: "%{hiera('mysql::root_password')}"
crm::drupal::dir: "%{hiera('crm::dir')/drupal}"
-crm::drupal::files_dir: '/srv/org.wikimedia.civicrm-files'
+crm::drupal::files_dir: "%{hiera('files_dir')}/org.wikimedia.civicrm-files"
hhvm::common_settings:
date:
@@ -103,7 +107,7 @@
hhvm::hhbc_dir: /var/run/hhvm
hhvm::logroot: /vagrant/logs
-kibana::deploy_dir: /srv/kibana
+kibana::deploy_dir: "%{hiera('vendor_dir')}/kibana"
kibana::default_route: /dashboard/elasticsearch/default
logstash::heap_memory_mb: 64
@@ -142,8 +146,8 @@
mediawiki::cache_dir: /var/cache/mediawiki
mediawiki::settings_dir: /vagrant/settings.d
mediawiki::upload_dir: "%{hiera('mediawiki::upload_root')}/images"
-mediawiki::upload_root: /srv
-mediawiki::page_dir: /srv/pages
+mediawiki::upload_root: "%{hiera('files_dir')}"
+mediawiki::page_dir: "%{hiera('files_dir')}/pages"
mediawiki::db_name: "%{hiera('mysql::default_db_name')}"
mediawiki::db_user: root
mediawiki::db_pass: "%{hiera('mysql::root_password')}"
@@ -154,13 +158,13 @@
mediawiki::apache::docroot: "%{hiera('apache::docroot')}"
mediawiki::jobrunner::commit: 5c927f9091f446452b9fd7bcb69614c7a7fe6eff
-mediawiki::jobrunner::dir: /srv/jobrunner
+mediawiki::jobrunner::dir: "%{hiera('services_dir')}/jobrunner"
mediawiki::multiwiki::base_domain: '.wiki.local.wmftest.net'
mediawiki::multiwiki::script_dir: "%{hiera('mediawiki::apache::docroot')}/w"
mediawiki::multiwiki::settings_root:
"%{hiera('mediawiki::settings_dir')}/wikis"
-mediawiki::parsoid::dir: /srv/parsoid
+mediawiki::parsoid::dir: "%{hiera('services_dir')}/parsoid"
mediawiki::parsoid::port: 8000
mediawiki::parsoid::use_php_preprocessor: true
mediawiki::parsoid::use_selser: true
@@ -173,13 +177,13 @@
phabricator::deploy_dir: /vagrant/phab
phabricator::vhost_name: phabricator.local.wmftest.net
-phpmailer::dir: /srv/phpmailer
+phpmailer::dir: "%{hiera('services_dir')}/phpmailer"
# We are masterless and have no need to run an agent.
puppet::agent::ensure: stopped
puppet::agent::enable: false
-redis::dir: /srv/redis
+redis::dir: "%{hiera('vendor_dir')}/redis"
redis::persist: true
redis::max_memory: 256M
@@ -191,13 +195,13 @@
role::sentry::dsn: "%{hiera('sentry::dsn_file')}"
-role::wikimetrics::dir: /vagrant/wikimetrics
+role::wikimetrics::dir: "%{hiera('services_dir')}/wikimetrics"
scholarships::vhost_name: scholarships.local.wmftest.net
scholarships::db_name: scholarships
scholarships::db_user: scholarships
scholarships::db_pass: scholarships
-scholarships::deploy_dir: /vagrant/scholarships
+scholarships::deploy_dir: "%{hiera('services_dir')}/scholarships"
scholarships::cache_dir: /var/cache/scholarships
scholarships::log_file: /vagrant/logs/scholarships.log
@@ -205,17 +209,17 @@
sentry::db_user: sentry
sentry::db_pass: vagrant
sentry::vhost_name: sentry.local.wmftest.net
-sentry::deploy_dir: /srv/sentry
+sentry::deploy_dir: "%{hiera('vendor_dir')}/sentry"
sentry::cfg_file: /etc/sentry.conf.py
sentry::mail_log_dir: /vagrant/logs/sentry-mail
sentry::secret_key: s0F2ybS8jPLvzadqVudo7VykVWT1JO9FoErhc6gkJj6/KNWeFUbUiQ==
-sentry::dsn_file: /srv/sentry/sentry_dsn.txt
+sentry::dsn_file: "%{hiera('sentry::deploy_dir')}/sentry_dsn.txt"
sentry::admin_user: admin
sentry::admin_pass: vagrant
smtplog::log_file: /vagrant/logs/smtp.log
-twig::dir: /srv/twig
+twig::dir: "%{hiera('services_dir')}/twig"
-xhprofgui::dir: /srv/xhprof
+xhprofgui::dir: "%{hiera('vendor_dir')}/xhprof"
xhprofgui::profile_storage_dir: /vagrant/profiles
--
To view, visit https://gerrit.wikimedia.org/r/200624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I769c8da0509c8cd6d30955fe18228b19ffa9d216
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Dduvall <dduv...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
