BryanDavis has uploaded a new change for review. https://gerrit.wikimedia.org/r/165688
Change subject: iegreview: Add parsoid integration ...................................................................... iegreview: Add parsoid integration Change-Id: I9d3382418ce9face5b240859fcb40f38ebf56662 --- M puppet/hieradata/common.yaml M puppet/modules/iegreview/manifests/init.pp M puppet/modules/iegreview/templates/env.erb M puppet/modules/role/manifests/iegreview.pp 4 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/88/165688/1 diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index a61f77d..e2a5c6e 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -91,6 +91,7 @@ iegreview::cache_dir: /var/cache/iegreview iegreview::log_file: /vagrant/logs/iegreview.log iegreview::smtp_server: 127.0.0.1 +iegreview::parsoid_url: "http://localhost:%{::mediawiki::parsoid::port}/wiki/"; mediawiki::wiki_name: devwiki mediawiki::dir: /vagrant/mediawiki diff --git a/puppet/modules/iegreview/manifests/init.pp b/puppet/modules/iegreview/manifests/init.pp index 1f53cb4..7c8531d 100644 --- a/puppet/modules/iegreview/manifests/init.pp +++ b/puppet/modules/iegreview/manifests/init.pp @@ -23,13 +23,16 @@ # Apache vhost name. (example: 'iegreview.local.wmftest.net') # # [*cache_dir*] -# The directory to use for caching twig templates +# The directory to use for caching twig templates and parsoid responses # # [*log_file*] # File to write log messages to # # [*smtp_server*] # SMTP server to send mail through +# +# [*parsoid_url*] +# Parsoid API url # class iegreview( $db_name, @@ -40,6 +43,7 @@ $cache_dir, $log_file, $smtp_server, + $parsoid_url, ){ include ::php include ::apache diff --git a/puppet/modules/iegreview/templates/env.erb b/puppet/modules/iegreview/templates/env.erb index 2ae52db..6d38e2a 100644 --- a/puppet/modules/iegreview/templates/env.erb +++ b/puppet/modules/iegreview/templates/env.erb @@ -13,8 +13,11 @@ ; SMTP relay for outgoing email messages SMTP_HOST=<%= @smtp_server %> -; Directory for apache to write twig template cache files +; Directory for apache to write twig template and parsoid cache files CACHE_DIR=<%= @cache_dir %> +; Parsoid API url for parsing wikitext into HTML +PARSOID_URL=<%= @parsoid_url %> + ; This is a testing deployment SLIM_MODE=development diff --git a/puppet/modules/role/manifests/iegreview.pp b/puppet/modules/role/manifests/iegreview.pp index 030ffc6..14348f3 100644 --- a/puppet/modules/role/manifests/iegreview.pp +++ b/puppet/modules/role/manifests/iegreview.pp @@ -5,6 +5,7 @@ # Once the role is enabled and provisioned use the URL # http://iegreview.local.wmftest.net:8080/ to access the site. class role::iegreview { + include ::mediawiki::parsoid include ::iegreview include ::smtplog } -- To view, visit https://gerrit.wikimedia.org/r/165688 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d3382418ce9face5b240859fcb40f38ebf56662 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: BryanDavis <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
