Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/104500


Change subject: Give etherpad-old a coup de grace
......................................................................

Give etherpad-old a coup de grace

This removes the package and etherpad configuration. Another patchset
should follow that later to fully remove the misc::etherpad class

Change-Id: Idba216883a9da388271c971840afef8dc521af0a
---
M manifests/misc/etherpad.pp
1 file changed, 6 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/104500/1

diff --git a/manifests/misc/etherpad.pp b/manifests/misc/etherpad.pp
index ca96900..69e4e94 100644
--- a/manifests/misc/etherpad.pp
+++ b/manifests/misc/etherpad.pp
@@ -12,42 +12,29 @@
 
     # NB: this has some GUI going on all up in it. first install must be done 
by hand.
     package { 'etherpad':
-        ensure => latest;
+        ensure => absent, # Wait until Jan 10 2014 and then turn this into 
purged
     }
 
     service { 'etherpad':
-        ensure  => running,
+        ensure  => stopped,
         require => Package['etherpad'];
     }
 
     file {
         '/etc/init.d/etherpad':
+            absent => absent,
             source => 'puppet:///files/misc/etherpad/etherpad.init',
-            mode   => '0555',
-            owner  => 'root',
-            group  => 'root';
         '/etc/apache2/sites-available/etherpad.proxy':
+            absent => absent,
             source => 
'puppet:///files/misc/etherpad/etherpad.proxy.apache.conf',
-            mode   => '0444',
-            owner  => 'root',
-            group  => 'root';
         '/etc/etherpad/etherpad.local.properties':
+            absent => absent,
             content => template('etherpad/etherpad.local.properties.erb'),
-            mode    => '0444',
-            owner   => 'root',
-            group   => 'root';
     }
 
     apache_module { 'proxy': name => 'proxy' }
 
-    apache_site { 'etherpad_proxy': name => 'etherpad.proxy'}
-
-    # Nagios monitoring
-    monitor_service { 'etherpad http':
-        description => 'Etherpad HTTP',
-        check_command => 'check_http_on_port!9000';
-    }
-
+    apache_site { 'etherpad_proxy': ensure => absent }
 }
 
 class misc::etherpad_lite {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idba216883a9da388271c971840afef8dc521af0a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>

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

Reply via email to