diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20110720/e82dc775/attachment.obj')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110720/e82dc775/attachment.obj | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110720/e82dc775/attachment.obj b/zarb-ml/mageia-sysadm/attachments/20110720/e82dc775/attachment.obj new file mode 100644 index 000000000..31bb65c11 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110720/e82dc775/attachment.obj @@ -0,0 +1,65 @@ +Index: deployment/common/manifests/init.pp +=================================================================== +--- deployment/common/manifests/init.pp (révision 1879) ++++ deployment/common/manifests/init.pp (copie de travail) +@@ -88,7 +88,6 @@ + } + + class default_mageia_server_no_smtp { +- include timezone + + include shadow + include openssh::server +Index: modules/ntp/manifests/init.pp +=================================================================== +--- modules/ntp/manifests/init.pp (révision 1879) ++++ modules/ntp/manifests/init.pp (copie de travail) +@@ -7,11 +7,10 @@ + service { ntpd: + ensure => running, + path => "/etc/init.d/ntpd", +- subscribe => [ Package["ntp"], File["ntp.conf"] ] ++ subscribe => [ Package["ntp"], File["/etc/ntp.conf"] ] + } + +- file { "ntp.conf": +- path => "/etc/ntp.conf", ++ file { "/etc/ntp.conf": + ensure => present, + owner => root, + group => root, +Index: modules/puppet/manifests/init.pp +=================================================================== +--- modules/puppet/manifests/init.pp (révision 1879) ++++ modules/puppet/manifests/init.pp (copie de travail) +@@ -5,8 +5,7 @@ + ensure => installed + } + +- file { "puppet.conf": +- path => "/etc/puppet/puppet.conf", ++ file { "/etc/puppet/puppet.conf": + ensure => present, + owner => root, + group => root, +@@ -36,7 +35,7 @@ + service { puppetmaster: + ensure => running, + path => "/etc/init.d/puppetmaster", +- subscribe => [ Package[puppet-server], File["puppet.conf"]] ++ subscribe => [ Package[puppet-server], File["/etc/puppet/puppet.conf"]] + } + + file { "extdata": +Index: manifests/nodes.pp +=================================================================== +--- manifests/nodes.pp (révision 1879) ++++ manifests/nodes.pp (copie de travail) +@@ -156,6 +156,7 @@ + # - install the server in datacenter + # - install a backup system + include common::default_mageia_server ++ timezone::timezone { "Europe/Paris": } + } + + # gandi-vm
\ No newline at end of file |