Ottomata has submitted this change and it was merged.
Change subject: Enable the new backup role in wikimetrics if set
......................................................................
Enable the new backup role in wikimetrics if set
Whether backup will initalize depends on the backup
environment variable which should only be set in production.
Bug: 66119
Change-Id: Ie6199de5d03146cf4955e89be0b87ffd331a7b0f
---
M manifests/role/wikimetrics.pp
M modules/wikimetrics
2 files changed, 29 insertions(+), 0 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/role/wikimetrics.pp b/manifests/role/wikimetrics.pp
index cbef7fe..99c444d 100644
--- a/manifests/role/wikimetrics.pp
+++ b/manifests/role/wikimetrics.pp
@@ -61,6 +61,11 @@
$meta_mw_consumer_key = $::passwords::wikimetrics::meta_mw_consumer_key
$meta_mw_client_secret = $::passwords::wikimetrics::meta_mw_client_secret
+ # base directory settings
+ $var_directory = '/var/lib/wikimetrics'
+ $public_subdirectory = 'public'
+ $public_directory = "${var_directory}/${public_subdirectory}"
+
# Run as daemon python process or in Apache WSGI.
$web_mode = $::wikimetrics_web_mode ? {
undef => 'apache',
@@ -154,6 +159,9 @@
# where this table is called 'revision_userindex'.
# The mediawiki database usually calls this 'revision'.
revision_tablename => 'revision_userindex',
+
+ var_directory => $var_directory,
+ public_subdirectory => $public_subdirectory,
}
# Run the wikimetrics/scripts/install script
@@ -181,7 +189,14 @@
}
}
+ # Install redis and use a custom config template.
+ # Wikimetrics needs redis to save data for longer
+ # than the default redis.conf.erb template allows.
+ $redis_dir = '/a/redis'
+ $redis_dbfilename = "${hostname}-6379.rdb"
class { '::redis':
+ dir => $redis_dir,
+ dbfilename => $redis_dbfilename,
saves => [ "900 1", "300 10", "60 20" ],
stop_writes_on_bgsave_error => true,
}
@@ -203,4 +218,18 @@
class { '::wikimetrics::scheduler':
require => Exec['install_wikimetrics_dependencies'],
}
+
+ # backup regardless of whether we are in debug mode or not
+ if $::wikimetrics_backup {
+ class { '::wikimetrics::backup':
+ destination => '/data/project/wikimetrics/backup',
+ db_user => $db_user_wikimetrics,
+ db_pass => $db_pass_wikimetrics,
+ db_name => $db_name_wikimetrics,
+ db_host => $db_host_wikimetrics,
+ redis_db_file => "${redis_dir}/${redis_dbfilename}",
+ public_files => $public_directory,
+ keep_days => 10,
+ }
+ }
}
diff --git a/modules/wikimetrics b/modules/wikimetrics
index 007bb44..3c9e50a 160000
--- a/modules/wikimetrics
+++ b/modules/wikimetrics
-Subproject commit 007bb44a39ccbb027e986b6aa349f260b47b7d4f
+Subproject commit 3c9e50a453be49e4ef5949baa5a8339d7275e95a
--
To view, visit https://gerrit.wikimedia.org/r/139558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6199de5d03146cf4955e89be0b87ffd331a7b0f
Gerrit-PatchSet: 11
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Milimetric <dandree...@wikimedia.org>
Gerrit-Reviewer: Milimetric <dandree...@wikimedia.org>
Gerrit-Reviewer: Nuria <nu...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: QChris <christ...@quelltextlich.at>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
