diff options
| author | Michael Scherer <misc@mageia.org> | 2010-11-07 23:36:49 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-11-07 23:36:49 +0000 |
| commit | 0d62c2499235a5e3788972a24e82b0adc25df6a7 (patch) | |
| tree | f7de7aeb5233e3121ef7be86729a7a7e282c28d1 | |
| parent | 4c5251ae7263b84a29e739783b92fb1d04ff9377 (diff) | |
| download | puppet-0d62c2499235a5e3788972a24e82b0adc25df6a7.tar puppet-0d62c2499235a5e3788972a24e82b0adc25df6a7.tar.gz puppet-0d62c2499235a5e3788972a24e82b0adc25df6a7.tar.bz2 puppet-0d62c2499235a5e3788972a24e82b0adc25df6a7.tar.xz puppet-0d62c2499235a5e3788972a24e82b0adc25df6a7.zip | |
- remove tabulation ( so indentation is really fixed )
- clean old comments ( ie, things we deployed )
| -rw-r--r-- | manifests/nodes.pp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/manifests/nodes.pp b/manifests/nodes.pp index d6d2591f..454da5ee 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -9,7 +9,6 @@ node valstar { # - 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 @@ node alamut { # - 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 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": } } @@ -82,8 +80,8 @@ node fiona { # 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 @@ 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,10 +108,9 @@ 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 include blog } |