Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399969 )

Change subject: zotero: convert role to profile
......................................................................

zotero: convert role to profile

Change-Id: Id946c17e99c12daaa73a132f1bd9c66b7c6e3859
---
A modules/profile/manifests/zotero.pp
M modules/role/manifests/zotero.pp
2 files changed, 20 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/69/399969/1

diff --git a/modules/profile/manifests/zotero.pp 
b/modules/profile/manifests/zotero.pp
new file mode 100644
index 0000000..2bcb108
--- /dev/null
+++ b/modules/profile/manifests/zotero.pp
@@ -0,0 +1,19 @@
+# Zotero is a free and open-source reference management software
+# for bibliographic data and related research materials.
+# See <https://en.wikipedia.org/wiki/Zotero>.
+#
+class profile::zotero {
+
+    class { '::zotero': }
+
+    ferm::service { 'zotero_http_1969':
+        proto => 'tcp',
+        port  => '1969',
+    }
+
+    # The check command is specific enough to warrant its own nagios command
+    monitoring::service { 'zotero':
+        description   => 'zotero',
+        check_command => 'check_http_zotero!1969',
+    }
+}
diff --git a/modules/role/manifests/zotero.pp b/modules/role/manifests/zotero.pp
index 58edb54..e485df2 100644
--- a/modules/role/manifests/zotero.pp
+++ b/modules/role/manifests/zotero.pp
@@ -8,16 +8,5 @@
 class role::zotero {
     system::role { 'zotero': description => "Zotero ${::realm}" }
 
-    ferm::service { 'zotero_http_1969':
-        proto => 'tcp',
-        port  => '1969',
-    }
-
-    # The check command is specific enough to warrant its own nagios command
-    monitoring::service { 'zotero':
-        description   => 'zotero',
-        check_command => 'check_http_zotero!1969',
-    }
-
-    include ::zotero
+    include ::profile::zotero
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/399969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id946c17e99c12daaa73a132f1bd9c66b7c6e3859
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to