[MediaWiki-commits] [Gerrit] Revert geowiki separate class backup changes - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/97021
Change subject: Revert geowiki separate class backup changes
..
Revert geowiki separate class backup changes
The whole let's prepend $misc::statistics::geowiki::params::
everywhere is super ugly hard to read through. Case in point: this
broke puppet on stat1 with:
err: Could not retrieve catalog from remote server: Error 400 on SERVER:
Must pass directory to Git::Clone[geowiki-data-public] at
/etc/puppet/modules/git/manifests/clone.pp:34 on node
stat1.wikimedia.org
We could of course fix it in place, but the fact that it's so unreadable
makes it necessary enough to use a different approach.
This reverts commits ceb34961941e984c0646a761097da05430f1c6fd
commit 0ec1823e5f9eccf62fd20fee424fb83bdbcfd155.
Change-Id: I7789080a16870ecd50e2a123f89f1ab8bd64e6de
---
M manifests/misc/statistics.pp
M manifests/role/backup.pp
2 files changed, 75 insertions(+), 74 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/97021/1
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index 73f45ae..ceb1f5d 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -39,16 +39,8 @@
# Labs has security groups, and as such, doesn't need firewall rules
}
-# == Class misc::statistics::user::params
-# Parameters for the statistics user
-class misc::statistics::user::params {
-$username = stats
-}
-
class misc::statistics::user {
-require misc::statistics::user::params
-
-$username = $misc::statistics::user::params::username
+$username = stats
$homedir = /var/lib/$username
generic::systemuser { $username:
@@ -261,8 +253,7 @@
# stats.wikimedia.org
class misc::statistics::sites::stats {
-require misc::statistics::geowiki::data::private,
-misc::statistics::geowiki::params
+require misc::statistics::geowiki::data::private
$site_name = stats.wikimedia.org
$docroot = /srv/$site_name/htdocs
@@ -288,7 +279,7 @@
# link geowiki checkout from docroot
file { $geowiki_private_directory:
ensure = link,
-target =
${misc::statistics::geowiki::params::private_data_path}/datafiles,
+target =
${misc::statistics::geowiki::data::private::geowiki_private_data_path}/datafiles,
owner = root,
group = www-data,
mode= '0750',
@@ -844,36 +835,21 @@
}
-# == Class misc::statistics::geowiki::params
-# Parameters for geowiki classes
-class misc::statistics::geowiki::params {
-require misc::statistics::user::params
-
-$username= $misc::statistics::user::params::username
-$base_path = '/a/geowiki'
-$log_path= ${base_path}/logs
-$scripts_path= ${base_path}/scripts
-$private_data_bare_path = ${base_path}/data-private-bare
-$private_data_bare_host = stat1
-$private_data_bare_host_fqdn =
${geowiki_private_data_bare_host}.wikimedia.org
-$private_data_path = ${base_path}/data-private
-$public_data_path= ${base_path}/data-public
-$mysql_conf_research_file= ${base_path}/.research.my.cnf
-$mysql_conf_globaldev_file = ${base_path}/.globaldev.my.cnf
-}
-
# == Class misc::statistics::geowiki
# Clones analytics/geowiki python scripts
class misc::statistics::geowiki {
-require misc::statistics::user,
-misc::statistics::geowiki::params
+require misc::statistics::user
+
+$geowiki_user = $misc::statistics::user::username
+$geowiki_base_path = '/a/geowiki'
+$geowiki_scripts_path = ${geowiki_base_path}/scripts
git::clone { 'geowiki-scripts':
-directory = $misc::statistics::geowiki::params::scripts_path,
+directory = $geowiki_scripts_path,
origin= https://gerrit.wikimedia.org/r/p/analytics/geowiki.git;,
ensure= 'latest',
-owner = $misc::statistics::geowiki::params::username,
-group = $misc::statistics::geowiki::params::username,
+owner = $geowiki_user,
+group = $geowiki_user,
}
}
@@ -885,12 +861,16 @@
require misc::statistics::geowiki,
passwords::mysql::research
+$geowiki_user = $misc::statistics::geowiki::geowiki_user
+$geowiki_base_path = $misc::statistics::geowiki::geowiki_base_path
+
$research_mysql_user = $passwords::mysql::research::user
$research_mysql_pass = $passwords::mysql::research::pass
-file { $misc::statistics::geowiki::params::mysql_conf_research_file:
-owner = $misc::statistics::geowiki::params::username,
-group = $misc::statistics::geowiki::params::username,
+$conf_file = ${geowiki_base_path}/.research.my.cnf
+file { $conf_file:
+owner = $geowiki_user,
+group = $geowiki_user,
mode
[MediaWiki-commits] [Gerrit] Revert geowiki separate class backup changes - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Revert geowiki separate class backup changes
..
Revert geowiki separate class backup changes
The whole let's prepend $misc::statistics::geowiki::params::
everywhere is super ugly hard to read through. Case in point: this
broke puppet on stat1 with:
err: Could not retrieve catalog from remote server: Error 400 on SERVER:
Must pass directory to Git::Clone[geowiki-data-public] at
/etc/puppet/modules/git/manifests/clone.pp:34 on node
stat1.wikimedia.org
We could of course fix it in place, but the fact that it's so unreadable
makes it necessary enough to use a different approach.
This reverts commits ceb34961941e984c0646a761097da05430f1c6fd
commit 0ec1823e5f9eccf62fd20fee424fb83bdbcfd155.
Change-Id: I7789080a16870ecd50e2a123f89f1ab8bd64e6de
---
M manifests/misc/statistics.pp
M manifests/role/backup.pp
2 files changed, 75 insertions(+), 74 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index 73f45ae..ceb1f5d 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -39,16 +39,8 @@
# Labs has security groups, and as such, doesn't need firewall rules
}
-# == Class misc::statistics::user::params
-# Parameters for the statistics user
-class misc::statistics::user::params {
-$username = stats
-}
-
class misc::statistics::user {
-require misc::statistics::user::params
-
-$username = $misc::statistics::user::params::username
+$username = stats
$homedir = /var/lib/$username
generic::systemuser { $username:
@@ -261,8 +253,7 @@
# stats.wikimedia.org
class misc::statistics::sites::stats {
-require misc::statistics::geowiki::data::private,
-misc::statistics::geowiki::params
+require misc::statistics::geowiki::data::private
$site_name = stats.wikimedia.org
$docroot = /srv/$site_name/htdocs
@@ -288,7 +279,7 @@
# link geowiki checkout from docroot
file { $geowiki_private_directory:
ensure = link,
-target =
${misc::statistics::geowiki::params::private_data_path}/datafiles,
+target =
${misc::statistics::geowiki::data::private::geowiki_private_data_path}/datafiles,
owner = root,
group = www-data,
mode= '0750',
@@ -844,36 +835,21 @@
}
-# == Class misc::statistics::geowiki::params
-# Parameters for geowiki classes
-class misc::statistics::geowiki::params {
-require misc::statistics::user::params
-
-$username= $misc::statistics::user::params::username
-$base_path = '/a/geowiki'
-$log_path= ${base_path}/logs
-$scripts_path= ${base_path}/scripts
-$private_data_bare_path = ${base_path}/data-private-bare
-$private_data_bare_host = stat1
-$private_data_bare_host_fqdn =
${geowiki_private_data_bare_host}.wikimedia.org
-$private_data_path = ${base_path}/data-private
-$public_data_path= ${base_path}/data-public
-$mysql_conf_research_file= ${base_path}/.research.my.cnf
-$mysql_conf_globaldev_file = ${base_path}/.globaldev.my.cnf
-}
-
# == Class misc::statistics::geowiki
# Clones analytics/geowiki python scripts
class misc::statistics::geowiki {
-require misc::statistics::user,
-misc::statistics::geowiki::params
+require misc::statistics::user
+
+$geowiki_user = $misc::statistics::user::username
+$geowiki_base_path = '/a/geowiki'
+$geowiki_scripts_path = ${geowiki_base_path}/scripts
git::clone { 'geowiki-scripts':
-directory = $misc::statistics::geowiki::params::scripts_path,
+directory = $geowiki_scripts_path,
origin= https://gerrit.wikimedia.org/r/p/analytics/geowiki.git;,
ensure= 'latest',
-owner = $misc::statistics::geowiki::params::username,
-group = $misc::statistics::geowiki::params::username,
+owner = $geowiki_user,
+group = $geowiki_user,
}
}
@@ -885,12 +861,16 @@
require misc::statistics::geowiki,
passwords::mysql::research
+$geowiki_user = $misc::statistics::geowiki::geowiki_user
+$geowiki_base_path = $misc::statistics::geowiki::geowiki_base_path
+
$research_mysql_user = $passwords::mysql::research::user
$research_mysql_pass = $passwords::mysql::research::pass
-file { $misc::statistics::geowiki::params::mysql_conf_research_file:
-owner = $misc::statistics::geowiki::params::username,
-group = $misc::statistics::geowiki::params::username,
+$conf_file = ${geowiki_base_path}/.research.my.cnf
+file { $conf_file:
+owner = $geowiki_user,
+group = $geowiki_user,
mode= '0400',
content =
