Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346921 )
Change subject: etherpad: convert to profile/role structure
......................................................................
etherpad: convert to profile/role structure
Change-Id: I7ec9581907bf9bfb29f35694144302e6eb65cb3a
---
M manifests/site.pp
R modules/profile/manifests/etherpad/server.pp
A modules/role/manifests/etherpad_server.pp
3 files changed, 12 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/346921/1
diff --git a/manifests/site.pp b/manifests/site.pp
index a7a729d..6227e3b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1050,7 +1050,7 @@
# Etherpad (virtual machine)
node 'etherpad1001.eqiad.wmnet' {
- role(etherpad::server)
+ role(etherpad_server)
}
# Receives log data from Kafka processes it, and broadcasts
diff --git a/modules/role/manifests/etherpad/server.pp
b/modules/profile/manifests/etherpad/server.pp
similarity index 85%
rename from modules/role/manifests/etherpad/server.pp
rename to modules/profile/manifests/etherpad/server.pp
index 7f84afb..46be216 100644
--- a/modules/role/manifests/etherpad/server.pp
+++ b/modules/profile/manifests/etherpad/server.pp
@@ -1,12 +1,7 @@
# sets up an Etherpad lite server
-class role::etherpad::server{
- include ::standard
- include ::base::firewall
- include passwords::etherpad_lite
+class profile::etherpad::server{
- system::role { 'etherpad::server':
- description => 'Etherpad-lite server'
- }
+ include ::base::firewall
class { '::etherpad':
etherpad_db_user => $passwords::etherpad_lite::etherpad_db_user,
diff --git a/modules/role/manifests/etherpad_server.pp
b/modules/role/manifests/etherpad_server.pp
new file mode 100644
index 0000000..b780414
--- /dev/null
+++ b/modules/role/manifests/etherpad_server.pp
@@ -0,0 +1,9 @@
+# sets up an Etherpad lite server
+class role::etherpad_server{
+
+ system::role { 'etherpad::server': description => 'Etherpad-lite server' }
+
+ include ::standard
+ include ::profile::etherpad::server
+ include ::passwords::etherpad_lite
+}
--
To view, visit https://gerrit.wikimedia.org/r/346921
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ec9581907bf9bfb29f35694144302e6eb65cb3a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
