[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Sort common.yaml alphabetically

2017-09-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377662 )

Change subject: Sort common.yaml alphabetically
..


Sort common.yaml alphabetically

Change-Id: I5be5a719ed6cfda170c55a81a710afe5113b4e6e
---
M puppet/hieradata/common.yaml
1 file changed, 57 insertions(+), 64 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 82915ab..b2290ee 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -4,15 +4,6 @@
   - '::role::mediawiki'
   - '::puppet::agent'
 
-mwv::files_dir: /srv
-mwv::etc_dir: /etc/mw-vagrant
-mwv::services_dir: /vagrant/srv
-mwv::vendor_dir: /srv
-mwv::tld: '.local.wmftest.net'
-mwv::cachefilesd::enable: true
-
-three_d::three_d_2png_dir: /srv/3d2png
-
 apache::docroot: /var/www
 arcanist::deploy_dir: "%{hiera('mwv::services_dir')}"
 
@@ -28,7 +19,6 @@
 
 citoid::port: '1970'
 citoid::log_level: info
-role::citoid::url: 
"//%{hiera('role::mediawiki::hostname')}:%{hiera('citoid::port')}/api"
 
 changeprop::port: 7272
 
@@ -46,7 +36,6 @@
 contenttranslation::intarget: false
 contenttranslation::namespace: 'Main'
 contenttranslation::suggestions: true
-
 contenttranslation::wikis:
   en:
 category_keyword: 'Category'
@@ -149,7 +138,6 @@
 hack:
   lang:
 iconv_ignore_correct: true
-
 hhvm::fcgi_settings:
   max_execution_time: 180
   hhvm:
@@ -161,7 +149,6 @@
 enable: 1
 remote_connect_back: 1
 remote_enable: 1
-
 hhvm::docroot: "%{hiera('apache::docroot')}"
 hhvm::hhbc_dir: /var/cache/hhvm
 hhvm::logroot: /vagrant/logs
@@ -176,18 +163,11 @@
 logstash::output::elasticsearch::manage_indices: true
 logstash::output::elasticsearch::priority: 90
 
-mathoid::port: 10042
-mathoid::svg: true
-mathoid::img: true
-mathoid::png: true
-mathoid::texvcinfo: true
-mathoid::speak_text: true
-mathoid::render_no_check: true
-
-mobilecontentservice::port: 
-
 graphoid::port: 11042
-
+graphoid::headers:
+  'Cache-Control': 'public, s-maxage=3600, max-age=3600'
+graphoid::error_headers:
+  'Cache-Control': 'public, s-maxage=300, max-age=300'
 # These settings should match the puppet/modules/role/manifests/graph.pp 
(ideally they should be the same)
 graphoid::allowed_domains:
   http:
@@ -212,13 +192,6 @@
   wikidatasparql:
 - query.wikidata.org
 - wdqs-test.wmflabs.org
-graphoid::headers:
-  'Cache-Control': 'public, s-maxage=3600, max-age=3600'
-graphoid::error_headers:
-  'Cache-Control': 'public, s-maxage=300, max-age=300'
-
-php::sessionclean::ensure: present
-php::xhprof::profile_storage_dir: /vagrant/profiles
 
 iegreview::vhost_name: "iegreview%{hiera('mwv::tld')}"
 iegreview::db_name: iegreview
@@ -229,6 +202,14 @@
 iegreview::log_file: /vagrant/logs/iegreview.log
 iegreview::smtp_server: 127.0.0.1
 iegreview::parsoid_url: "http://127.0.0.1:%{::parsoid::port}/localhost/;
+
+mathoid::port: 10042
+mathoid::svg: true
+mathoid::img: true
+mathoid::png: true
+mathoid::texvcinfo: true
+mathoid::speak_text: true
+mathoid::render_no_check: true
 
 mediawiki::wiki_name: devwiki
 mediawiki::dir: /vagrant/mediawiki
@@ -245,7 +226,6 @@
 
 mediawiki::apache::docroot: "%{hiera('apache::docroot')}"
 mediawiki::apache::php5_site_name: "php5%{hiera('mwv::tld')}"
-
 
 mediawiki::jobrunner::enable: true
 mediawiki::jobrunner::dir: "%{hiera('mwv::services_dir')}/jobrunner"
@@ -271,17 +251,19 @@
 mediawiki::mwrepl::default_db_name: "%{hiera('mediawiki::db_name')}"
 mediawiki::mwrepl::script_dir: "%{hiera('mediawiki::multiwiki::script_dir')}"
 
-parsoid::port: 8000
-parsoid::domain: "%{hiera('role::mediawiki::hostname')}"
-parsoid::uri: "http://localhost%{::port_fragment}/w/api.php;
-parsoid::use_php_preprocessor: true
-parsoid::use_selser: true
-parsoid::allow_cors: '*'
-
 mysql::host: '127.0.0.1'
 mysql::default_db_name: wiki
 mysql::root_password: vagrant
 mysql::grant_host_name: 'localhost'
+
+mobilecontentservice::port: 
+
+mwv::files_dir: /srv
+mwv::etc_dir: /etc/mw-vagrant
+mwv::services_dir: /vagrant/srv
+mwv::vendor_dir: /srv
+mwv::tld: '.local.wmftest.net'
+mwv::cachefilesd::enable: true
 
 nginx::variant: extras
 
@@ -291,30 +273,24 @@
 ores::vhost_name: "ores%{hiera('mwv::tld')}"
 ores::port: 18880
 
+parsoid::port: 8000
+parsoid::domain: "%{hiera('role::mediawiki::hostname')}"
+parsoid::uri: "http://localhost%{::port_fragment}/w/api.php;
+parsoid::use_php_preprocessor: true
+parsoid::use_selser: true
+parsoid::allow_cors: '*'
+
+payments::branch: fundraising/REL1_27
+payments::dir: /vagrant/mediawiki-fr
+
 phabricator::deploy_dir: "%{hiera('mwv::services_dir')}"
 phabricator::log_dir: "/vagrant/logs/phd"
 phabricator::vhost_name: "phabricator%{hiera('mwv::tld')}"
 phabricator::remote: https://secure.phabricator.com/diffusion/P/phabricator.git
 
-role::iabot::deploy_dir: "%{hiera('mwv::services_dir')}"

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Sort common.yaml alphabetically

2017-09-12 Thread Code Review 
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377662 )

Change subject: Sort common.yaml alphabetically
..

Sort common.yaml alphabetically

Change-Id: I5be5a719ed6cfda170c55a81a710afe5113b4e6e
---
M puppet/hieradata/common.yaml
1 file changed, 57 insertions(+), 64 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/62/377662/1

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 82915ab..b2290ee 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -4,15 +4,6 @@
   - '::role::mediawiki'
   - '::puppet::agent'
 
-mwv::files_dir: /srv
-mwv::etc_dir: /etc/mw-vagrant
-mwv::services_dir: /vagrant/srv
-mwv::vendor_dir: /srv
-mwv::tld: '.local.wmftest.net'
-mwv::cachefilesd::enable: true
-
-three_d::three_d_2png_dir: /srv/3d2png
-
 apache::docroot: /var/www
 arcanist::deploy_dir: "%{hiera('mwv::services_dir')}"
 
@@ -28,7 +19,6 @@
 
 citoid::port: '1970'
 citoid::log_level: info
-role::citoid::url: 
"//%{hiera('role::mediawiki::hostname')}:%{hiera('citoid::port')}/api"
 
 changeprop::port: 7272
 
@@ -46,7 +36,6 @@
 contenttranslation::intarget: false
 contenttranslation::namespace: 'Main'
 contenttranslation::suggestions: true
-
 contenttranslation::wikis:
   en:
 category_keyword: 'Category'
@@ -149,7 +138,6 @@
 hack:
   lang:
 iconv_ignore_correct: true
-
 hhvm::fcgi_settings:
   max_execution_time: 180
   hhvm:
@@ -161,7 +149,6 @@
 enable: 1
 remote_connect_back: 1
 remote_enable: 1
-
 hhvm::docroot: "%{hiera('apache::docroot')}"
 hhvm::hhbc_dir: /var/cache/hhvm
 hhvm::logroot: /vagrant/logs
@@ -176,18 +163,11 @@
 logstash::output::elasticsearch::manage_indices: true
 logstash::output::elasticsearch::priority: 90
 
-mathoid::port: 10042
-mathoid::svg: true
-mathoid::img: true
-mathoid::png: true
-mathoid::texvcinfo: true
-mathoid::speak_text: true
-mathoid::render_no_check: true
-
-mobilecontentservice::port: 
-
 graphoid::port: 11042
-
+graphoid::headers:
+  'Cache-Control': 'public, s-maxage=3600, max-age=3600'
+graphoid::error_headers:
+  'Cache-Control': 'public, s-maxage=300, max-age=300'
 # These settings should match the puppet/modules/role/manifests/graph.pp 
(ideally they should be the same)
 graphoid::allowed_domains:
   http:
@@ -212,13 +192,6 @@
   wikidatasparql:
 - query.wikidata.org
 - wdqs-test.wmflabs.org
-graphoid::headers:
-  'Cache-Control': 'public, s-maxage=3600, max-age=3600'
-graphoid::error_headers:
-  'Cache-Control': 'public, s-maxage=300, max-age=300'
-
-php::sessionclean::ensure: present
-php::xhprof::profile_storage_dir: /vagrant/profiles
 
 iegreview::vhost_name: "iegreview%{hiera('mwv::tld')}"
 iegreview::db_name: iegreview
@@ -229,6 +202,14 @@
 iegreview::log_file: /vagrant/logs/iegreview.log
 iegreview::smtp_server: 127.0.0.1
 iegreview::parsoid_url: "http://127.0.0.1:%{::parsoid::port}/localhost/;
+
+mathoid::port: 10042
+mathoid::svg: true
+mathoid::img: true
+mathoid::png: true
+mathoid::texvcinfo: true
+mathoid::speak_text: true
+mathoid::render_no_check: true
 
 mediawiki::wiki_name: devwiki
 mediawiki::dir: /vagrant/mediawiki
@@ -245,7 +226,6 @@
 
 mediawiki::apache::docroot: "%{hiera('apache::docroot')}"
 mediawiki::apache::php5_site_name: "php5%{hiera('mwv::tld')}"
-
 
 mediawiki::jobrunner::enable: true
 mediawiki::jobrunner::dir: "%{hiera('mwv::services_dir')}/jobrunner"
@@ -271,17 +251,19 @@
 mediawiki::mwrepl::default_db_name: "%{hiera('mediawiki::db_name')}"
 mediawiki::mwrepl::script_dir: "%{hiera('mediawiki::multiwiki::script_dir')}"
 
-parsoid::port: 8000
-parsoid::domain: "%{hiera('role::mediawiki::hostname')}"
-parsoid::uri: "http://localhost%{::port_fragment}/w/api.php;
-parsoid::use_php_preprocessor: true
-parsoid::use_selser: true
-parsoid::allow_cors: '*'
-
 mysql::host: '127.0.0.1'
 mysql::default_db_name: wiki
 mysql::root_password: vagrant
 mysql::grant_host_name: 'localhost'
+
+mobilecontentservice::port: 
+
+mwv::files_dir: /srv
+mwv::etc_dir: /etc/mw-vagrant
+mwv::services_dir: /vagrant/srv
+mwv::vendor_dir: /srv
+mwv::tld: '.local.wmftest.net'
+mwv::cachefilesd::enable: true
 
 nginx::variant: extras
 
@@ -291,30 +273,24 @@
 ores::vhost_name: "ores%{hiera('mwv::tld')}"
 ores::port: 18880
 
+parsoid::port: 8000
+parsoid::domain: "%{hiera('role::mediawiki::hostname')}"
+parsoid::uri: "http://localhost%{::port_fragment}/w/api.php;
+parsoid::use_php_preprocessor: true
+parsoid::use_selser: true
+parsoid::allow_cors: '*'
+
+payments::branch: fundraising/REL1_27
+payments::dir: /vagrant/mediawiki-fr
+
 phabricator::deploy_dir: "%{hiera('mwv::services_dir')}"
 phabricator::log_dir: "/vagrant/logs/phd"
 phabricator::vhost_name: "phabricator%{hiera('mwv::tld')}"
 phabricator::remote: https://secure.phabricator.com/diffusion/P/phabricator.git
 
-role::iabot::deploy_dir: "%{hiera('mwv::services_dir')}"