Revision

193

Author

misc

Date

2010-11-08 00:36:49 +0100 (Mon, 08 Nov 2010)

Log Message

- remove tabulation ( so indentation is really fixed )
- clean old comments ( ie, things we deployed )

Modified Paths

• puppet/manifests/nodes.pp

Modified: puppet/manifests/nodes.pp
===================================================================
--- puppet/manifests/nodes.pp	2010-11-07 23:30:39 UTC (rev 192)
+++ puppet/manifests/nodes.pp	2010-11-07 23:36:49 UTC (rev 193)
@@ -9,7 +9,6 @@
 # - setup restricted shell access to allow "mdvsys submit" to work
 # - setup maintainers database (with web interface)
 # - mirroring (Nanar)
-# - LDAP master
 #
     include default_mageia_server
     timezone::timezone { "Europe/Paris": }
@@ -40,11 +39,10 @@
 # - mail server
 # - mailing list server
 # - wiki
-# - pastbin
+# - pastebin
 # - LDAP slave
-# - SQL server
 # 
-	  include default_mageia_server
+    include default_mageia_server
     include bind::bind_master
     include postgresql
     bind::zone_master { "mageia.org": }
@@ -61,16 +59,16 @@
 node jonund {
 # Location: IELO datacenter (marseille)
 #
-	  include default_mageia_server
-	  include iurt
+    include default_mageia_server
+    include iurt
     timezone::timezone { "Europe/Paris": }
 }
 
 node ecosse {
 # Location: IELO datacenter (marseille)
 #
-	  include default_mageia_server
-	  include iurt
+    include default_mageia_server
+    include iurt
     timezone::timezone { "Europe/Paris": }
 }
 
@@ -82,8 +80,8 @@
 # TODO:
 # - buy the server
 # - install the server in datacenter
-#
-	  include default_mageia_server
+# - install a backup system
+    include default_mageia_server
 } 
 
 # gandi-vm
@@ -94,7 +92,7 @@
 # - secondary MX
 # - LDAP slave (for external traffic maybe)
 #
-	  include default_mageia_server
+    include default_mageia_server
     include bind::bind_master
     bind::zone_master { "mageia.org": }
     bind::zone_master { "mageia.fr": } 
@@ -110,10 +108,9 @@
 # - setup mageia.org web site
 # - setup blog
 #
-	  include default_mageia_server
+    include default_mageia_server
     include apache::base
     timezone::timezone { "Europe/Paris": }
-    #include postfix
     include blog
 }