Madhuvishy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/260687
Change subject: [WIP] wikimetrics: Puppet module for wikimetrics
......................................................................
[WIP] wikimetrics: Puppet module for wikimetrics
This is a new puppet module for setting up wikimetrics. Very WIP.
So far,
- Deleted old submodule entry from .gitmodules
- Added base.pp for new module, sets up user and config repo
Change-Id: Ibe7d751b4a1a3b2339af55dcbfba2fb3cde10f0f
---
M .gitmodules
D modules/wikimetrics
A modules/wikimetrics/base.pp
3 files changed, 57 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/260687/1
diff --git a/.gitmodules b/.gitmodules
index 2e209d2..7e18bd9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,9 +10,6 @@
[submodule "modules/varnishkafka"]
path = modules/varnishkafka
url = https://gerrit.wikimedia.org/r/operations/puppet/varnishkafka
-[submodule "modules/wikimetrics"]
- path = modules/wikimetrics
- url = https://gerrit.wikimedia.org/r/operations/puppet/wikimetrics
[submodule "modules/kafkatee"]
path = modules/kafkatee
url = https://gerrit.wikimedia.org/r/operations/puppet/kafkatee
diff --git a/modules/wikimetrics b/modules/wikimetrics
deleted file mode 160000
index 1e694e3..0000000
--- a/modules/wikimetrics
+++ /dev/null
-Subproject commit 1e694e3630d256c20b9b0bcef25efc6778602e6e
diff --git a/modules/wikimetrics/base.pp b/modules/wikimetrics/base.pp
new file mode 100644
index 0000000..8ff8216
--- /dev/null
+++ b/modules/wikimetrics/base.pp
@@ -0,0 +1,57 @@
+# = Class: wikimetrics
+# This class sets up the wikimetrics user and the deploy repo
+#
+class wikimetrics::base (
+ $branch = 'master',
+) {
+
+ $owner = 'wikimetrics'
+ $group = 'wikimetrics'
+ $venv_path = '/srv/wikimetrics/venv'
+ $config_path = '/srv/wikimetrics/config'
+
+ # We use virtualenv and pip install requirements because not all of them
+ # have debian packages available
+ ensure_packages(['virtualenv', 'gcc', 'python-dev', 'libmysqlclient-dev'])
+
+ if !defined(Group[$group]) {
+ group { $group:
+ ensure => 'present',
+ system => true,
+ }
+ }
+ if !defined(User[$user]) {
+ user { $user:
+ ensure => 'present',
+ gid => $group,
+ home => $path,
+ managehome => false,
+ system => true,
+ }
+ }
+
+ file { '/srv':
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0775',
+ }
+
+ file { '/srv/wikimetrics':
+ ensure => directory,
+ owner => $owner,
+ group => $group,
+ mode => '0775',
+ require => File['/srv'],
+ }
+
+ git::clone { 'wikimetrics-deploy':
+ ensure => present,
+ origin =>
'https://gerrit.wikimedia.org/r/analytics/wikimetrics-deploy',
+ directory => $config_path,
+ branch => $branch,
+ owner => $owner,
+ group => $group,
+ require => File['/srv/wikimetrics'],
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/260687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe7d751b4a1a3b2339af55dcbfba2fb3cde10f0f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
