From 9fb1a7f4026ca5d74b7ac4613bef38ca02cf91d4 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Sun, 10 Dec 2017 16:52:26 +0000
Subject: Remove config for servoces no longer running on krampouezh

---
 manifests/nodes/champagne.pp  | 22 ----------------------
 manifests/nodes/krampouezh.pp | 13 -------------
 manifests/nodes/neru.pp       |  2 +-
 3 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 manifests/nodes/champagne.pp

(limited to 'manifests/nodes')

diff --git a/manifests/nodes/champagne.pp b/manifests/nodes/champagne.pp
deleted file mode 100644
index 42a343d9..00000000
--- a/manifests/nodes/champagne.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-node champagne {
-# Location: gandi VM
-#
-    include common::default_mageia_server
-    timezone::timezone { 'Europe/Paris': }
-    include blog::files_bots
-    include blog::files_backup
-    include planet
-    include websites::archives
-    include websites::static
-    include websites::hugs
-    include websites::releases
-    include websites::www
-    include websites::doc
-    include websites::start
-    include dashboard
-    include access_classes::web
-    include openssh::ssh_keys_from_ldap
-
-    # temporary protection for CVE-2011-3192
-    include apache::cve-2011-3192
-}
diff --git a/manifests/nodes/krampouezh.pp b/manifests/nodes/krampouezh.pp
index 52fd93f5..37fde92c 100644
--- a/manifests/nodes/krampouezh.pp
+++ b/manifests/nodes/krampouezh.pp
@@ -6,22 +6,9 @@ node krampouezh {
     #include common::default_mageia_server
     include common::default_mageia_server_no_smtp
     include postfix::server::secondary
-    include blog::base
-    include blog::db_backup
-    include mysql::server
-    include dns::server
     timezone::timezone { 'Europe/Paris': }
 
     openldap::slave_instance { '1':
         rid => 1,
     }
-
-    # http server for meetbot logs
-    include apache::base
-
-    # temporary protection for CVE-2011-3192
-    include apache::cve-2011-3192
-
-# Other services running on this server :
-# - meetbot
 }
diff --git a/manifests/nodes/neru.pp b/manifests/nodes/neru.pp
index e2ca3be9..bbe38421 100644
--- a/manifests/nodes/neru.pp
+++ b/manifests/nodes/neru.pp
@@ -30,5 +30,5 @@ node neru {
     # http server for meetbot logs
     include apache::base
 }
-# Other services not yet running on this server :
+# Other services running on this server :
 # - meetbot
-- 
cgit v1.2.1