aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorDexter Morgan <dmorgan@mageia.org>2010-11-06 19:56:02 +0000
committerDexter Morgan <dmorgan@mageia.org>2010-11-06 19:56:02 +0000
commite508c1edc7a7e1e8b4ca1250ddbf0672af644b00 (patch)
tree88a7d0f597e21417ad50bc6ff33ce33490e0b00a /manifests
parent4ba494653a962f2cdbe48d3859356ef4ba48997e (diff)
downloadpuppet-e508c1edc7a7e1e8b4ca1250ddbf0672af644b00.tar
puppet-e508c1edc7a7e1e8b4ca1250ddbf0672af644b00.tar.gz
puppet-e508c1edc7a7e1e8b4ca1250ddbf0672af644b00.tar.bz2
puppet-e508c1edc7a7e1e8b4ca1250ddbf0672af644b00.tar.xz
puppet-e508c1edc7a7e1e8b4ca1250ddbf0672af644b00.zip
Fix ident
Diffstat (limited to 'manifests')
-rw-r--r--manifests/nodes.pp17
1 files changed, 8 insertions, 9 deletions
diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index 3ccf9679..7b93315e 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -41,10 +41,9 @@ node alamut {
# - wiki
# - pastbin
# - LDAP slave
-# - transifex
# - SQL server
#
- include default_mageia_server
+ include default_mageia_server
include bind::bind_master
include postgresql
bind::zone_master { "mageia.org": }
@@ -61,16 +60,16 @@ node alamut {
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": }
}
@@ -83,7 +82,7 @@ node fiona {
# - buy the server
# - install the server in datacenter
#
- include default_mageia_server
+ include default_mageia_server
}
# gandi-vm
@@ -94,7 +93,7 @@ node krampouezh {
# - 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,7 +109,7 @@ node champagne {
# - setup mageia.org web site
# - setup blog
#
- include default_mageia_server
+ include default_mageia_server
include apache::base
timezone::timezone { "Europe/Paris": }
#include postfix