/[adm]/puppet/deployment/common/manifests/init.pp
ViewVC logotype

Diff of /puppet/deployment/common/manifests/init.pp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 493 by misc, Wed Dec 1 20:15:19 2010 UTC revision 555 by misc, Thu Dec 9 12:34:21 2010 UTC
# Line 84  class urpmi_update { Line 84  class urpmi_update {
84      }      }
85  }  }
86    
87  class default_mageia_server {  class default_mageia_server_no_smtp {
88      include timezone      include timezone
89    
90      include openssh::server      include openssh::server
91      include default_ssh_root_key      include default_ssh_root_key
92      include base_packages      include base_packages
93      include ntp      include ntp
     include postfix::simple_relay  
94      include urpmi_update      include urpmi_update
95      include puppet::client      include puppet::client
96    
97    
98    }
99    
100    class default_mageia_server inherits default_mageia_server_no_smtp {
101    
102        include postfix::simple_relay
103    #    include ssmtp
104  }  }
105    
106  class dns_server {  class dns_server {

Legend:
Removed from v.493  
changed lines
  Added in v.555

  ViewVC Help
Powered by ViewVC 1.1.30