Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/62171
Change subject: Fixes to code style
......................................................................
Fixes to code style
Change-Id: Idd204a3b49cc56d297b4bad36de60b4ac0ff21d9
---
M puppet/modules/git/manifests/clone.pp
M puppet/modules/mediawiki/manifests/init.pp
M puppet/modules/mediawiki/manifests/php.pp
M puppet/modules/memcached/templates/memcached.conf.erb
M puppet/modules/user_metrics/templates/settings.py.erb
M puppet/modules/user_metrics/templates/virtual_host.erb
6 files changed, 11 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/71/62171/1
diff --git a/puppet/modules/git/manifests/clone.pp
b/puppet/modules/git/manifests/clone.pp
index ca9de0e..f313389 100644
--- a/puppet/modules/git/manifests/clone.pp
+++ b/puppet/modules/git/manifests/clone.pp
@@ -1,5 +1,4 @@
define git::clone($directory, $remote=undef) {
-
include git
$url = $remote ? {
@@ -8,7 +7,7 @@
}
exec { "git clone ${title}":
- command => "git clone ${options} ${url} ${directory}",
+ command => "git clone ${url} ${directory}",
creates => "${directory}/.git/refs/remotes",
require => Package['git'],
logoutput => true,
diff --git a/puppet/modules/mediawiki/manifests/init.pp
b/puppet/modules/mediawiki/manifests/init.pp
index a612eca..3eb2d1d 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -52,7 +52,6 @@
creates => '/vagrant/mediawiki/LocalSettings.php',
cwd => '/vagrant/mediawiki/maintenance/',
command => "php install.php ${wiki} ${admin} --pass ${pass}
--dbname ${dbname} --dbuser ${dbuser} --dbpass ${dbpass} --server ${server}
--scriptpath '/w'",
- logoutput => on_failure,
notify => Service['apache2'],
}
diff --git a/puppet/modules/mediawiki/manifests/php.pp
b/puppet/modules/mediawiki/manifests/php.pp
index b844d4c..7671b35 100644
--- a/puppet/modules/mediawiki/manifests/php.pp
+++ b/puppet/modules/mediawiki/manifests/php.pp
@@ -1,6 +1,5 @@
# PHP dependencies for MediaWiki
class mediawiki::php {
-
include apache
package { [
@@ -22,5 +21,4 @@
apache::mod { 'php5':
ensure => present,
}
-
}
diff --git a/puppet/modules/memcached/templates/memcached.conf.erb
b/puppet/modules/memcached/templates/memcached.conf.erb
index 1608a50..769f536 100644
--- a/puppet/modules/memcached/templates/memcached.conf.erb
+++ b/puppet/modules/memcached/templates/memcached.conf.erb
@@ -1,9 +1,9 @@
# memcached default config file
-d
--m <%= size_mb %>
--p <%= port %>
+-m <%= @size_mb %>
+-p <%= @port %>
-u nobody
--l <%= iface %>
+-l <%= @iface %>
-c 20000
-n 5
-f 1.05
diff --git a/puppet/modules/user_metrics/templates/settings.py.erb
b/puppet/modules/user_metrics/templates/settings.py.erb
index b66bd1a..49d8b5f 100644
--- a/puppet/modules/user_metrics/templates/settings.py.erb
+++ b/puppet/modules/user_metrics/templates/settings.py.erb
@@ -13,10 +13,10 @@
# Project settings
# ================
-__instance_host__ = '<%= site_name %>'
+__instance_host__ = '<%= @site_name %>'
__instance_port__ = 5000
-__project_home__ = '<%= user_metrics_path %>'
+__project_home__ = '<%= @user_metrics_path %>'
__web_home__ = os.path.join(__project_home__,
'user_metrics/api/')
__data_file_dir__ = os.path.join(__project_home__, 'data/')
@@ -28,9 +28,9 @@
__cohort_data_instance__ = 'cohorts'
__cohort_db__ = 'usertags'
__cohort_meta_db__ = 'usertags_meta'
-__cohort_meta_instance__ = '<%= user_metrics_db_name %>'
+__cohort_meta_instance__ = '<%= @user_metrics_db_name %>'
-__secret_key__ = '<%= secret_key %>'
+__secret_key__ = '<%= @secret_key %>'
try:
working_set.require('Flask-Login>=0.1.2')
diff --git a/puppet/modules/user_metrics/templates/virtual_host.erb
b/puppet/modules/user_metrics/templates/virtual_host.erb
index bf08175..fb0a303 100644
--- a/puppet/modules/user_metrics/templates/virtual_host.erb
+++ b/puppet/modules/user_metrics/templates/virtual_host.erb
@@ -11,11 +11,11 @@
Listen 8182
<VirtualHost *:8182>
- ServerName <%= site_name %>
+ ServerName <%= @site_name %>
ServerAdmin http://www.mediawiki.org/wiki/Vagrant
- WSGIDaemonProcess api user=<%= metrics_user %> group=www-data threads=5
python-path=<%= user_metrics_path %>
- WSGIScriptAlias / <%= document_root %>/api.wsgi
+ WSGIDaemonProcess api user=<%= @metrics_user %> group=www-data threads=5
python-path=<%= @user_metrics_path %>
+ WSGIScriptAlias / <%= @document_root %>/api.wsgi
<Directory <%= document_root %>>
WSGIProcessGroup api
--
To view, visit https://gerrit.wikimedia.org/r/62171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd204a3b49cc56d297b4bad36de60b4ac0ff21d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
